基点LITE1液氮罐

src/dashoo.cn/backend/api/controllers/equipment/equipment.go

@@ -770,6 +770,96 @@ func (this *EquipmentController) AddEquipment() {
 		lastnum_shelf.LastNum = "F" + utils.ToStr(num_lastdata)
 		svcshelf.UpdateShelfNum(lastnum_shelf, this.User.AccCode)
 
+	} else if model.DItem == 22 {
+		shelf_x_int := 1
+		shelf_y_int := 13
+		box_x_int := 10
+		box_y_int := 10
+		svcshelf := shelfset.GetshelfsetService(utils.DBE)
+		lastdata := svcshelf.GetLastShelfNum(this.User.AccCode)
+		num_lastdata, _ := utils.StrTo(lastdata[1:]).Int64()
+		lastdata_box := svcshelf.GetLastBoxNum(this.User.AccCode)
+		num_lastdata_box, _ := utils.StrTo(lastdata_box[1:]).Int64()
+		for i := 1; i <= equip.RowNum; i++ {
+			for j := 1; j <= equip.ColumnNum; j++ {
+				var shelfempty shelfset.Shelf
+				shelfempty.AccCode = this.User.AccCode
+				shelfempty.EquipmentId = equip.Id
+				shelfempty.Code = "F" + utils.ToStr(num_lastdata)
+				shelfempty.BarCode = "F" + utils.ToStr(num_lastdata)
+				shelfempty.RowNum = shelf_x_int
+				shelfempty.ColumnNum = shelf_y_int
+				shelfempty.XStation = j
+				shelfempty.YStation = i
+				shelfempty.SampleType = equip.SampleType
+				shelfempty.CreateBy = this.User.Realname
+				shelfempty.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+				num_lastdata = num_lastdata + 1
+				_, err = svcshelf.InsertEntity(&shelfempty)
+				sqlfield := " AccCode,EquipmentId,ShelfId,XStation,YStation,RowNum,ColumnNum,"
+				sqlvalue := "'" + this.User.AccCode + "'," + utils.ToStr(equip.Id) + "," + utils.ToStr(shelfempty.Id) + "," + utils.ToStr(j) + "," + utils.ToStr(i) + "," + utils.ToStr(shelf_x_int) + "," + utils.ToStr(shelf_y_int) + ","
+				ii, jj := shelf_x_int, shelf_y_int
+				//添加冻存盒
+				if box_x_int > 0 && box_y_int > 0 {
+					for e := 0; e < ii; e++ {
+						charname := Boxlinename(e + 1)
+						for f := 0; f < jj; f++ {
+							fieldname := fmt.Sprintf("%v%v", charname, f+1)
+							if f == jj-1 && e == ii-1 {
+								sqlfield += fieldname
+								sqlvalue += "-1"
+							} else {
+								sqlfield += fieldname + ","
+								sqlvalue += "-1,"
+							}
+						}
+					}
+					for a := 1; a <= shelf_x_int; a++ {
+						for b := 1; b <= shelf_y_int; b++ {
+							var boxempty shelfset.Box
+							boxempty.AccCode = this.User.AccCode
+							boxempty.EquipmentId = equip.Id
+							boxempty.ShelfId = shelfempty.Id
+							boxempty.Code = "B" + utils.ToStr(num_lastdata_box)
+							boxempty.BarCode = "B" + utils.ToStr(num_lastdata_box)
+							boxempty.YStation = a
+							boxempty.XStation = b
+							boxempty.RowNum = box_x_int
+							boxempty.ColumnNum = box_y_int
+							boxempty.SampleType = equip.SampleType
+							boxempty.CreateBy = this.User.Realname
+							boxempty.CreateBy = this.User.Realname
+							num_lastdata_box = num_lastdata_box + 1
+							_, err = svc.InsertEntity(&boxempty)
+						}
+					}
+				} else {
+					for e := 0; e < ii; e++ {
+						charname := Boxlinename(e + 1)
+						for f := 0; f < jj; f++ {
+							fieldname := fmt.Sprintf("%v%v", charname, f+1)
+							if f == jj-1 && e == ii-1 {
+								sqlfield += fieldname
+								sqlvalue += "-2"
+							} else {
+								sqlfield += fieldname + ","
+								sqlvalue += "-2,"
+							}
+						}
+					}
+				}
+				svc1 := currboxcapacity.GetCurrboxcapacityService(utils.DBE)
+				svc1.Add(sqlfield, sqlvalue)
+			}
+		}
+		num_lastdata_box = num_lastdata_box - 1
+		var lastnum lastordernum.LastOrderNum
+		lastnum.LastNum = "B" + utils.ToStr(num_lastdata_box)
+		svcshelf.UpdateBoxNum(lastnum, this.User.AccCode)
+		num_lastdata = num_lastdata - 1
+		var lastnum_shelf lastordernum.LastOrderNum
+		lastnum_shelf.LastNum = "F" + utils.ToStr(num_lastdata)
+		svcshelf.UpdateShelfNum(lastnum_shelf, this.User.AccCode)
 	} else {
 
 		if model.Shelf_X > 0 && model.Shelf_y > 0 {

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

@@ -14,7 +14,7 @@ module.exports = {
    ** Headers of the page
    */
   head: {
-    title: '样本库系统', 
+    title: '样本库系统',
     meta: [{
         charset: 'utf-8'
       },
@@ -159,8 +159,8 @@ module.exports = {
   },
 
   axios: {
-    // baseURL: '//localhost:9081/api/' // 本机开发使用
-    baseURL: '//47.92.238.200:9081/api/' // BioBank on ALi发布使用
+    baseURL: '//localhost:9081/api/' // 本机开发使用
+    // baseURL: '//47.92.238.200:9081/api/' // BioBank on ALi发布使用
     // baseURL: '//188.188.30.89:9081/api/' //临沂使用
     // baseURL: '//api09.labsop.cn/api/'
     // baseURL: '//192.168.0.211:10091/api/' // 花生所系统
@@ -175,8 +175,8 @@ module.exports = {
   env: {
     appclient: 'biobank', //因顿LIMS:lims,样本库：biobank,细胞制备：cellbank，样本搜索判断，登录跳转判断
 
-    //imgserverhost: 'http://localhost:9081', // BioBank服务地址,图片上传文件
-    imgserverhost: 'http://47.92.238.200:9081', // BioBank服务地址,图片上传文件
+    imgserverhost: 'http://localhost:9081', // BioBank服务地址,图片上传文件
+    // imgserverhost: 'http://47.92.238.200:9081', // BioBank服务地址,图片上传文件
     upfilehost: 'http://weed1.labsop.cn:9333/dir/assign', // 附件上传
 
     //imgserverhost: 'http://188.188.30.89:9081', // 临沂服务地址,图片上传文件

src/dashoo.cn/frontend_web/src/layouts/default.vue

@@ -14,6 +14,8 @@
         id="cryobiobank97K_bloodbagimg">
       <img src="/img/cryobiobank97K_newmodel.png" style="width: 300px; height: 300px;display: none;"
            id="cryobiobank97K_newmodelimg">
+      <img src="/img/genepointlite1.jpg" style="width: 300px; height: 300px;display: none;"
+           id="GenePointLITE1">
       <div id="divmenudiv" onmouseover="onoverdivmenu()" onmouseout="onoutdivmenu()" class="menudiv">
         <div class="menutext" style="display:none;" id="divmenutext">
         </div>

src/dashoo.cn/frontend_web/src/pages/equipment/_opera/manage_new.vue

@@ -2607,6 +2607,270 @@
             type: 1
           }
         ],
+        genepointlite1: [ // 22：基点LITE1全自动液氮罐
+          {
+            XStation: 1,
+            YStation: 1,
+            x1: 158,
+            y1: 45,
+            x2: 209,
+            y2: 34,
+            x3: 220,
+            y3: 84,
+            x4: 171,
+            y4: 96,
+            type: 2
+          },
+          {
+            XStation: 2,
+            YStation: 1,
+            x1: 130,
+            y1: 60,
+            x2: 162,
+            y2: 100,
+            x3: 123,
+            y3: 133,
+            x4: 91,
+            y4: 92,
+            type: 2
+          },
+          {
+            XStation: 3,
+            YStation: 1,
+            x1: 70,
+            y1: 117,
+            x2: 117,
+            y2: 140,
+            x3: 95,
+            y3: 187,
+            x4: 48,
+            y4: 163,
+            type: 2
+          },
+          {
+            XStation: 4,
+            YStation: 1,
+            x: 41,
+            y: 196,
+            width: 50,
+            height: 50,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 1,
+            x1: 95,
+            y1: 256,
+            x2: 117,
+            y2: 302,
+            x3: 71,
+            y3: 325,
+            x4: 48,
+            y4: 279,
+            type: 2
+          },
+          {
+            XStation: 6,
+            YStation: 1,
+            x1: 123,
+            y1: 310,
+            x2: 162,
+            y2: 341,
+            x3: 130,
+            y3: 382,
+            x4: 91,
+            y4: 350,
+            type: 2
+          },
+          {
+            XStation: 7,
+            YStation: 1,
+            x1: 171,
+            y1: 345,
+            x2: 220,
+            y2: 357,
+            x3: 208,
+            y3: 408,
+            x4: 160,
+            y4: 397,
+            type: 2
+          },
+          {
+            XStation: 8,
+            YStation: 1,
+            x1: 230,
+            y1: 358,
+            x2: 279,
+            y2: 346,
+            x3: 291,
+            y3: 396,
+            x4: 241,
+            y4: 407,
+            type: 2
+          },
+          {
+            XStation: 9,
+            YStation: 1,
+            x1: 328,
+            y1: 309,
+            x2: 360,
+            y2: 350,
+            x3: 319,
+            y3: 382,
+            x4: 288,
+            y4: 343,
+            type: 2
+          },
+          {
+            XStation: 10,
+            YStation: 1,
+            x1: 356,
+            y1: 256,
+            x2: 401,
+            y2: 278,
+            x3: 380,
+            y3: 325,
+            x4: 333,
+            y4: 302,
+            type: 2
+          },
+          {
+            XStation: 11,
+            YStation: 1,
+            x: 358,
+            y: 196,
+            width: 50,
+            height: 50,
+            type: 1
+          },
+          {
+            XStation: 12,
+            YStation: 1,
+            x1: 379,
+            y1: 117,
+            x2: 402,
+            y2: 163,
+            x3: 355,
+            y3: 187,
+            x4: 333,
+            y4: 141,
+            type: 2
+          },
+          {
+            XStation: 13,
+            YStation: 1,
+            x1: 320,
+            y1: 60,
+            x2: 360,
+            y2: 92,
+            x3: 328,
+            y3: 133,
+            x4: 287,
+            y4: 101,
+            type: 2
+          },
+          {
+            XStation: 14,
+            YStation: 1,
+            x1: 241,
+            y1: 34,
+            x2: 290,
+            y2: 46,
+            x3: 279,
+            y3: 96,
+            x4: 230,
+            y4: 85,
+            type: 2
+          },
+          {
+            XStation: 15,
+            YStation: 1,
+            x: 200,
+            y: 100,
+            width: 50,
+            height: 50,
+            type: 1
+          },
+          {
+            XStation: 16,
+            YStation: 1,
+            x1: 156,
+            y1: 115,
+            x2: 193,
+            y2: 152,
+            x3: 157,
+            y3: 189,
+            x4: 121,
+            y4: 152,
+            type: 2
+          },
+          {
+            XStation: 17,
+            YStation: 1,
+            x: 103,
+            y: 195,
+            width: 50,
+            height: 50,
+            type: 1
+          },
+          {
+            XStation: 18,
+            YStation: 1,
+            x1: 157,
+            y1: 253,
+            x2: 193,
+            y2: 290,
+            x3: 156,
+            y3: 327,
+            x4: 121,
+            y4: 290,
+            type: 2
+          },
+          {
+            XStation: 19,
+            YStation: 1,
+            x: 200,
+            y: 292,
+            width: 50,
+            height: 50,
+            type: 1
+          },
+          {
+            XStation: 20,
+            YStation: 1,
+            x1: 293,
+            y1: 254,
+            x2: 329,
+            y2: 291,
+            x3: 293,
+            y3: 326,
+            x4: 257,
+            y4: 290,
+            type: 2
+          },
+          {
+            XStation: 21,
+            YStation: 1,
+            x: 296,
+            y: 195,
+            width: 50,
+            height: 50,
+            type: 1
+          },
+          {
+            XStation: 22,
+            YStation: 1,
+            x1: 294,
+            y1: 116,
+            x2: 328,
+            y2: 151,
+            x3: 294,
+            y3: 188,
+            x4: 257,
+            y4: 152,
+            type: 2
+          }
+        ],
         waituploads: [], // 等待上传的附件列表
         downloadTemplates: [{
           Name: "默认模版"
@@ -2680,8 +2944,10 @@
                 yedanguandatarrtrmp = _this.yedanguanrongqiarr_13kbloodbag
               } else if (_this.yedanguanitem === 19) {
                 yedanguandatarrtrmp = _this.yedanguanrongqiarr
-              } else {
+              } else if (_this.yedanguanitem === 21) {
                 yedanguandatarrtrmp = _this.yedanguanrongqiarr_newmodel
+              } else {
+                yedanguandatarrtrmp = _this.genepointlite1
               }
               for (let i = 0; i < yedanguandatarrtrmp.length; i++) {
                 if ((yedanguandatarrtrmp[i].XStation + '') === stationarr[0] && (yedanguandatarrtrmp[i].YStation +
@@ -2797,14 +3063,16 @@
               _this.showtsyedanguan = false
               _this.showcgshebei = true
               _this.fridgebottomimg = _this.filehost + '/static/img/sampletypeimg/bottomydg.png'
-            } else if (res.data && (res.data.DItem === 19 || res.data.DItem === 20 || res.data.DItem === 21)) {
+            } else if (res.data && (res.data.DItem === 19 || res.data.DItem === 20 || res.data.DItem === 21 || res.data.DItem === 22)) {
               _this.yedanguanitem = res.data.DItem
               if (res.data.DItem === 19) {
                 _this.yeshuyedanguanimgid = 'cryobiobank97Kimg'
               } else if (res.data.DItem === 20) {
                 _this.yeshuyedanguanimgid = 'cryobiobank97K_bloodbagimg'
-              } else {
+              } else if (res.data.DItem === 21) {
                 _this.yeshuyedanguanimgid = 'cryobiobank97K_newmodelimg'
+              } else {
+                _this.yeshuyedanguanimgid = 'GenePointLITE1'
               }
               // 加载特殊液氮罐
               _this.drawyedanguancanvasbgimg()
@@ -2839,10 +3107,12 @@
         let yedanguandatarrtrmp = []
         if (_this.yedanguanitem === 20) {
           yedanguandatarrtrmp = _this.yedanguanrongqiarr_13kbloodbag
-        } else if (_this.yedanguanitem === 19){
+        } else if (_this.yedanguanitem === 19) {
           yedanguandatarrtrmp = _this.yedanguanrongqiarr
-        } else {
+        } else if (_this.yedanguanitem === 21) {
           yedanguandatarrtrmp = _this.yedanguanrongqiarr_newmodel
+        } else {
+          yedanguandatarrtrmp = _this.genepointlite1
         }
         yedanguandatarrtrmp.forEach(function (v) {
           // 绘制颜色快
@@ -2895,7 +3165,8 @@
         })
       },
       // 获取液氮罐点击canvas的坐标
-      getEventPosition(ev) {
+      getEventPosition (ev) {
+        console.log('?????????:', ev)
         let x, y
         if (ev.layerX || ev.layerX === 0) {
           x = ev.layerX

src/dashoo.cn/frontend_web/src/pages/equipment/_opera/operation.vue

@@ -379,6 +379,12 @@
                     _this.haveshelf = true
                     _this.showdchdcj = false
                     break
+                  case 22:
+                    _this.formmodel.RowNum = '1'
+                    _this.formmodel.ColumnNum = '22'
+                    _this.haveshelf = true
+                    _this.showdchdcj = false
+                    break
                   default:
                     _this.formmodel.RowNum = '1'
                     _this.formmodel.ColumnNum = '1'

src/dashoo.cn/frontend_web/src/pages/equipment/index.vue

@@ -63,7 +63,7 @@
               <router-link :to="'/equipment/' + v.Equipment.Id + '/manage_new?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
                 <el-button type="primary" size="mini">样本录入</el-button>
               </router-link>
-              <router-link v-if="v.Equipment.DItem !== 20 && v.Equipment.DItem !== 19 && v.Equipment.DItem !== 21" :to="'/equipment/' + v.Equipment.Id + '/shelfset_new?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
+              <router-link v-if="v.Equipment.DItem !== 20 && v.Equipment.DItem !== 19 && v.Equipment.DItem !== 21 && v.Equipment.DItem !== 22" :to="'/equipment/' + v.Equipment.Id + '/shelfset_new?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
                 <el-button type="primary" size="mini">设置</el-button>
               </router-link>
               <el-button type="primary" size="mini" @click="copy(v.Equipment.Id, v.Equipment.Code)">复制</el-button>