新添加液氮罐

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

@@ -68,7 +68,7 @@ type EquipmentModel struct {
 	ProduceDate  int64    `json:"ProduceDate,omitempty"`  // 备注
 	Checkedstr   string   `json:"checkedstr,omitempty"`   // 样本类型
 	Remark       string   `json:"Remark,omitempty"`       // 位置信息
-	DItem        int      `json:"DItem,omitempty"`        // 设备类型19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐
+	DItem        int      `json:"DItem,omitempty"`        // 设备类型19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐；21：贝尔Cryobiobank13K_NewModel液氮罐
 }
 
 // @Title 容器列表
@@ -494,7 +494,7 @@ func (this *EquipmentController) AddEquipment() {
 		return
 	}
 	//同步添加冻存架
-	// 19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐
+	// 19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐；21：贝尔Cryobiobank13K_NewModel液氮罐
 	if model.DItem == 19 {
 		shelf_x_int := 1
 		shelf_y_int := 1
@@ -688,6 +688,109 @@ func (this *EquipmentController) AddEquipment() {
 		lastnum_shelf.LastNum = "F" + utils.ToStr(num_lastdata)
 		svcshelf.UpdateShelfNum(lastnum_shelf, this.User.AccCode)
 
+	} else if model.DItem == 21 {
+		shelf_x_int := 1
+		shelf_y_int := 13
+		box_x_int := 1
+		box_y_int := 1
+		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++ {
+				if i == 2 || i == 5{	//其他为大型格10x10冻存盒
+					box_x_int = 10
+					box_y_int = 10
+				} else {
+					if j == 1|| j == 2 || j == 3 || j == 4 {	//第1,2,3,4个为小型格5x5冻存盒
+						box_x_int = 5
+						box_y_int = 5
+					} else {	//其他为大型格10x10冻存盒
+						box_x_int = 10
+						box_y_int = 10
+					}
+				}
+				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_animal/src/layouts/default.vue

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

src/dashoo.cn/frontend_animal/src/pages/equipment/_opera/manage.vue

@@ -63,18 +63,18 @@
                     style="width:50px;float:left;margin-left:1px">
                     <div v-for="b in selectdtedanguan.ColumnNum">
                       <div class="hoverdiv" v-if="(b <= g*21) && (b > (g - 1)*21)"
-                        @click="handleclk(b-1, 0, selectdtedanguan.YStation, selectdtedanguan.XStation)" v-bind:style="{ 
-                        backgroundColor: xbox == b && ybox == 1 && 
-                        xshelf == selectdtedanguan.YStation && yshelf == selectdtedanguan.XStation ? COLORARR[2] : 
-                        (selectdtedanguan['A'+b] == -2 ? COLORARR[0] : 
-                        (selectdtedanguan['A'+b] == -1 ? COLORARR[1] : 
-                        (selectdtedanguan['A'+b] > 0 && 
-                        selectdtedanguan['A'+b] <= 25 ? COLORARR[3] : 
-                        (selectdtedanguan['A'+b] > 25 && 
-                        selectdtedanguan['A'+b] <= 50 ? COLORARR[4] : 
-                        (selectdtedanguan['A'+b] > 50 && 
-                        selectdtedanguan['A'+b] <= 75 ? COLORARR[5] : 
-                        (selectdtedanguan['A'+b] > 75 ? COLORARR[6] : 
+                        @click="handleclk(b-1, 0, selectdtedanguan.YStation, selectdtedanguan.XStation)" v-bind:style="{
+                        backgroundColor: xbox == b && ybox == 1 &&
+                        xshelf == selectdtedanguan.YStation && yshelf == selectdtedanguan.XStation ? COLORARR[2] :
+                        (selectdtedanguan['A'+b] == -2 ? COLORARR[0] :
+                        (selectdtedanguan['A'+b] == -1 ? COLORARR[1] :
+                        (selectdtedanguan['A'+b] > 0 &&
+                        selectdtedanguan['A'+b] <= 25 ? COLORARR[3] :
+                        (selectdtedanguan['A'+b] > 25 &&
+                        selectdtedanguan['A'+b] <= 50 ? COLORARR[4] :
+                        (selectdtedanguan['A'+b] > 50 &&
+                        selectdtedanguan['A'+b] <= 75 ? COLORARR[5] :
+                        (selectdtedanguan['A'+b] > 75 ? COLORARR[6] :
                         COLORARR[7])))))) }" style="margin: 1px;width:50px; height:20px;"></div>
                     </div>
                   </div>
@@ -98,20 +98,20 @@
                           <div v-if="samplelist[index].XStation === k2+1 && samplelist[index].YStation === k1+1">
                             <div v-for="rowindex in samplelist[index].RowNum">
                               <div class="hoverdiv" v-for=" colindex in samplelist[index].ColumnNum">
-                                <div v-bind:style="{ 
+                                <div v-bind:style="{
                                 width: (unitwidth/colorTableWidth/samplelist[index].ColumnNum-2.5) + 'px',
                                 height: (unitheight/colorTableHeight/samplelist[index].RowNum-2.5) + 'px',
-                                backgroundColor: xbox == colindex && ybox == rowindex && 
-                                xshelf == k1+1 && yshelf == k2+1 ? COLORARR[2] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] == -2 ? COLORARR[0] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] == -1 ? COLORARR[1] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 0 && 
-                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 25 ? COLORARR[3] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 25 && 
-                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 50 ? COLORARR[4] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 50 && 
-                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 75 ? COLORARR[5] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 75 ? COLORARR[6] : 
+                                backgroundColor: xbox == colindex && ybox == rowindex &&
+                                xshelf == k1+1 && yshelf == k2+1 ? COLORARR[2] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] == -2 ? COLORARR[0] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] == -1 ? COLORARR[1] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 0 &&
+                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 25 ? COLORARR[3] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 25 &&
+                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 50 ? COLORARR[4] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 50 &&
+                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 75 ? COLORARR[5] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 75 ? COLORARR[6] :
                                 COLORARR[7])))))) }" style="margin: 1px"
                                   @click="handleclk(colindex-1, rowindex-1, k1+1, k2+1)"></div>
                               </div>
@@ -800,7 +800,7 @@
         selectdtedanguan: {
           ColumnNum: 0
         }, // 选中的特殊液氮罐的冻存架
-        yedanguanitem: 0, // 液氮罐类型19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐
+        yedanguanitem: 0, // 液氮罐类型19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐；21：贝尔最新型号液氮罐
         yedanguanrongqiarr: [ // 19：贝尔Cryobiobank13K液氮罐,type:1规则图形，2不规则图形
           {
             XStation: 4,
@@ -2185,6 +2185,386 @@
             type: 2
           }
         ],
+        yedanguanrongqiarr_newmodel: [ // 21：贝尔最新型号液氮罐,type:1规则图形，2不规则图形
+          {
+            XStation: 1,
+            YStation: 1,
+            x: 77,
+            y: 45,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 1,
+            x: 134,
+            y: 45,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 1,
+            x: 122,
+            y: 133,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 1,
+            x: 33,
+            y: 133,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 1,
+            x: 33,
+            y: 133,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 1,
+            x: 33,
+            y: 133,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 2,
+            x: 34,
+            y: 234,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 2,
+            x: 123,
+            y: 234,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 2,
+            x: 135,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 2,
+            x: 77,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 2,
+            x: 77,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 2,
+            x: 77,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 7,
+            YStation: 2,
+            x: 77,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 8,
+            YStation: 2,
+            x: 77,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 9,
+            YStation: 2,
+            x: 77,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 3,
+            x: 77,
+            y: 76,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 3,
+            x: 134,
+            y: 45,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 3,
+            x: 122,
+            y: 133,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 3,
+            x: 33,
+            y: 133,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 3,
+            x: 33,
+            y: 133,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 3,
+            x: 33,
+            y: 133,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 4,
+            x: 77,
+            y: 76,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 4,
+            x: 134,
+            y: 45,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 4,
+            x: 122,
+            y: 133,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 4,
+            x: 33,
+            y: 133,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 4,
+            x: 33,
+            y: 133,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 4,
+            x: 33,
+            y: 133,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 5,
+            x: 34,
+            y: 234,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 5,
+            x: 123,
+            y: 234,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 5,
+            x: 135,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 5,
+            x: 77,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 5,
+            x: 77,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 5,
+            x: 77,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 7,
+            YStation: 5,
+            x: 77,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 8,
+            YStation: 5,
+            x: 77,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 9,
+            YStation: 5,
+            x: 77,
+            y: 322,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 6,
+            x: 77,
+            y: 76,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 6,
+            x: 134,
+            y: 45,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 6,
+            x: 122,
+            y: 133,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 6,
+            x: 33,
+            y: 133,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 6,
+            x: 33,
+            y: 133,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 6,
+            x: 33,
+            y: 133,
+            width: 56,
+            height: 56,
+            type: 1
+          }
+        ],
         waituploads: [], // 等待上传的附件列表
         userlist: [], // 录入人
         downloadTemplates: [{
@@ -2343,8 +2723,10 @@
         let yedanguandatarrtrmp = []
         if (_this.yedanguanitem === 20) {
           yedanguandatarrtrmp = _this.yedanguanrongqiarr_13kbloodbag
-        } else {
+        } else if (_this.yedanguanitem === 19){
           yedanguandatarrtrmp = _this.yedanguanrongqiarr
+        } else {
+          yedanguandatarrtrmp = _this.yedanguanrongqiarr_newmodel
         }
         yedanguandatarrtrmp.forEach(function (v) {
           // 绘制颜色快
@@ -2450,17 +2832,19 @@
           .then(res => {
             _this.equcode = res.data.Code
             _this.titlename = `【容器-${res.data.Name}】`
-            // 4:液氮罐，19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐
+            // 4:液氮罐，19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐；21：贝尔最新型号液氮罐
             if (res.data && (res.data.DItem === 4)) {
               _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)) {
+            } else if (res.data && (res.data.DItem === 19 || res.data.DItem === 20 || res.data.DItem === 21)) {
               _this.yedanguanitem = res.data.DItem
               if (res.data.DItem === 19) {
                 _this.yeshuyedanguanimgid = 'cryobiobank97Kimg'
-              } else {
+              } else if (res.data.DItem === 20) {
                 _this.yeshuyedanguanimgid = 'cryobiobank97K_bloodbagimg'
+              } else {
+                _this.yeshuyedanguanimgid = 'cryobiobank97K_newmodelimg'
               }
               // 加载特殊液氮罐
               _this.drawyedanguancanvasbgimg()
@@ -2554,8 +2938,10 @@
               let yedanguandatarrtrmp = []
               if (_this.yedanguanitem === 20) {
                 yedanguandatarrtrmp = _this.yedanguanrongqiarr_13kbloodbag
-              } else {
+              } else if (_this.yedanguanitem === 19) {
                 yedanguandatarrtrmp = _this.yedanguanrongqiarr
+              } else {
+                yedanguandatarrtrmp = _this.yedanguanrongqiarr_newmodel
               }
               for (let i = 0; i < yedanguandatarrtrmp.length; i++) {
                 if ((yedanguandatarrtrmp[i].XStation + '') === stationarr[0] && (yedanguandatarrtrmp[i].YStation +
@@ -2745,7 +3131,7 @@
               // if(_this.acc =='sBBo4' || _this.acc == 'ssqOy'){
               let sampletypestr = _this.sampleform.SampleTypestr
               _this.getautobarcode(sampletypestr)
-              // }  
+              // }
             })
         }
       },

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

@@ -63,18 +63,18 @@
                         <div v-for="b in selectdtedanguan.ColumnNum" :key="b">
                           <div class="hoverdiv" v-if="(b <= g*21) && (b > (g - 1)*21)"
                             @click="handleclk(b-1, 0, selectdtedanguan.YStation, selectdtedanguan.XStation)"
-                            v-bind:style="{ 
-                              backgroundColor: xbox == b && ybox == 1 && 
-                              xshelf == selectdtedanguan.YStation && yshelf == selectdtedanguan.XStation ? COLORARR[2] : 
-                              (selectdtedanguan['A'+b] == -2 ? COLORARR[0] : 
-                              (selectdtedanguan['A'+b] == -1 ? COLORARR[1] : 
-                              (selectdtedanguan['A'+b] > 0 && 
-                              selectdtedanguan['A'+b] <= 25 ? COLORARR[3] : 
-                              (selectdtedanguan['A'+b] > 25 && 
-                              selectdtedanguan['A'+b] <= 50 ? COLORARR[4] : 
-                              (selectdtedanguan['A'+b] > 50 && 
-                              selectdtedanguan['A'+b] <= 75 ? COLORARR[5] : 
-                              (selectdtedanguan['A'+b] > 75 ? COLORARR[6] : 
+                            v-bind:style="{
+                              backgroundColor: xbox == b && ybox == 1 &&
+                              xshelf == selectdtedanguan.YStation && yshelf == selectdtedanguan.XStation ? COLORARR[2] :
+                              (selectdtedanguan['A'+b] == -2 ? COLORARR[0] :
+                              (selectdtedanguan['A'+b] == -1 ? COLORARR[1] :
+                              (selectdtedanguan['A'+b] > 0 &&
+                              selectdtedanguan['A'+b] <= 25 ? COLORARR[3] :
+                              (selectdtedanguan['A'+b] > 25 &&
+                              selectdtedanguan['A'+b] <= 50 ? COLORARR[4] :
+                              (selectdtedanguan['A'+b] > 50 &&
+                              selectdtedanguan['A'+b] <= 75 ? COLORARR[5] :
+                              (selectdtedanguan['A'+b] > 75 ? COLORARR[6] :
                               COLORARR[7])))))) }" style="margin: 1px;width:50px; height:20px;">
                           </div>
                         </div>
@@ -102,7 +102,7 @@
                                     v-if="samplelist[index].XStation === k2+1 && samplelist[index].YStation === k1+1">
                                     <div class="hoverdiv" v-for="rowindex in samplelist[index].RowNum" :key="rowindex">
                                       <div
-                                        v-bind:style="{ 
+                                        v-bind:style="{
                                           width: (unitwidth/colorTableWidth-2.5) + 'px',
                                           height: (unitheight/colorTableHeight/samplelist[index].RowNum-2.5) + 'px',
                                           backgroundColor: ybox == rowindex && xshelf == k1+1 && yshelf == k2+1 ? COLORARR[7] : COLORARR[0]}"
@@ -123,18 +123,18 @@
                     <el-col :span="4" style="margin-top: 20px">
                       <div class="ulbgcolor" v-for="g in shelfs.ColumnNum" :key="g"
                         style="width:150px;float:left;margin-left:1px">
-                        <div class="hoverdiv" v-bind:style="{ 
-                          backgroundColor: xbox == g && ybox == ybox && 
-                          xshelf == shelfs.YStation && yshelf == shelfs.XStation ? COLORARR[2] :                          
-                          (shelfs[numtoengs[ybox-1]+g] == -2 ? COLORARR[0] : 
-                          (shelfs[numtoengs[ybox-1]+g] == -1 ? COLORARR[1] : 
-                          (shelfs[numtoengs[ybox-1]+g] > 0 && 
-                          shelfs[numtoengs[ybox-1]+g] <= 25 ? COLORARR[3] : 
-                          (shelfs[numtoengs[ybox-1]+g] > 25 && 
-                          shelfs[numtoengs[ybox-1]+g] <= 50 ? COLORARR[4] : 
-                          (shelfs[numtoengs[ybox-1]+g] > 50 && 
-                          shelfs[numtoengs[ybox-1]+g] <= 75 ? COLORARR[5] : 
-                          (shelfs[numtoengs[ybox-1]+g] > 75 ? COLORARR[6] : 
+                        <div class="hoverdiv" v-bind:style="{
+                          backgroundColor: xbox == g && ybox == ybox &&
+                          xshelf == shelfs.YStation && yshelf == shelfs.XStation ? COLORARR[2] :
+                          (shelfs[numtoengs[ybox-1]+g] == -2 ? COLORARR[0] :
+                          (shelfs[numtoengs[ybox-1]+g] == -1 ? COLORARR[1] :
+                          (shelfs[numtoengs[ybox-1]+g] > 0 &&
+                          shelfs[numtoengs[ybox-1]+g] <= 25 ? COLORARR[3] :
+                          (shelfs[numtoengs[ybox-1]+g] > 25 &&
+                          shelfs[numtoengs[ybox-1]+g] <= 50 ? COLORARR[4] :
+                          (shelfs[numtoengs[ybox-1]+g] > 50 &&
+                          shelfs[numtoengs[ybox-1]+g] <= 75 ? COLORARR[5] :
+                          (shelfs[numtoengs[ybox-1]+g] > 75 ? COLORARR[6] :
                           COLORARR[7])))))) }" @click="handleclk(g-1, ybox-1, shelfs.YStation, shelfs.XStation)"
                           style="margin: 1px;width:50px; height:20px;">
                         </div>
@@ -836,7 +836,7 @@
         selectdtedanguan: {
           ColumnNum: 0
         }, // 选中的特殊液氮罐的冻存架
-        yedanguanitem: 0, // 液氮罐类型19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐
+        yedanguanitem: 0, // 液氮罐类型19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐；21：贝尔新型号液氮罐
         yedanguanrongqiarr: [ // 19：贝尔Cryobiobank13K液氮罐,type:1规则图形，2不规则图形
           {
             XStation: 4,
@@ -2221,6 +2221,386 @@
             type: 2
           }
         ],
+        yedanguanrongqiarr_newmodel: [ // 21：贝尔最新型号液氮罐,type:1规则图形，2不规则图形
+          {
+            XStation: 1,
+            YStation: 1,
+            x: 135,
+            y: 35,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 1,
+            x: 170,
+            y: 30,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 1,
+            x: 198,
+            y: 30,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 1,
+            x: 77,
+            y: 97,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 1,
+            x: 110,
+            y: 65,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 1,
+            x: 168,
+            y: 65,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 2,
+            x: 50,
+            y: 130,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 2,
+            x: 106,
+            y: 130,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 2,
+            x: 166,
+            y: 130,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 2,
+            x: 30,
+            y: 195,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 2,
+            x: 86,
+            y: 195,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 2,
+            x: 150,
+            y: 195,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 7,
+            YStation: 2,
+            x: 50,
+            y: 258,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 8,
+            YStation: 2,
+            x: 106,
+            y: 258,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 9,
+            YStation: 2,
+            x: 166,
+            y: 258,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 3,
+            x: 78,
+            y: 321,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 3,
+            x: 136,
+            y: 384,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 3,
+            x: 169,
+            y: 384,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 3,
+            x: 200,
+            y: 384,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 3,
+            x: 110,
+            y: 321,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 3,
+            x: 170,
+            y: 321,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 4,
+            x: 348,
+            y: 321,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 4,
+            x: 230,
+            y: 384,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 4,
+            x: 260,
+            y: 384,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 4,
+            x: 289,
+            y: 384,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 4,
+            x: 230,
+            y: 321,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 4,
+            x: 289,
+            y: 321,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 5,
+            x: 230,
+            y: 130,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 5,
+            x: 290,
+            y: 130,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 5,
+            x: 348,
+            y: 130,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 5,
+            x: 250,
+            y: 195,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 5,
+            x: 310,
+            y: 195,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 5,
+            x: 368,
+            y: 195,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 7,
+            YStation: 5,
+            x: 231,
+            y: 258,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 8,
+            YStation: 5,
+            x: 290,
+            y: 258,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 9,
+            YStation: 5,
+            x: 350,
+            y: 258,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 6,
+            x: 232,
+            y: 30,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 6,
+            x: 260,
+            y: 30,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 6,
+            x: 290,
+            y: 35,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 6,
+            x: 348,
+            y: 97,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 6,
+            x: 230,
+            y: 65,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 6,
+            x: 290,
+            y: 65,
+            width: 56,
+            height: 56,
+            type: 1
+          }
+        ],
         waituploads: [], // 等待上传的附件列表
         downloadTemplates: [{
           Name: "默认模版"
@@ -2273,7 +2653,7 @@
             _this.downloading = false
             _this.samplelist = res.data.items
             _this.colorTableWidth = res.data.dimension[0] //列
-            _this.colorTableHeight = res.data.dimension[1] //层           
+            _this.colorTableHeight = res.data.dimension[1] //层
             _this.location() //液氮罐
           })
           .catch(err => {
@@ -2292,8 +2672,10 @@
               let yedanguandatarrtrmp = []
               if (_this.yedanguanitem === 20) {
                 yedanguandatarrtrmp = _this.yedanguanrongqiarr_13kbloodbag
-              } else {
+              } else  if (_this.yedanguanitem === 19){
                 yedanguandatarrtrmp = _this.yedanguanrongqiarr
+              } else {
+                yedanguandatarrtrmp = _this.yedanguanrongqiarr_newmodel
               }
               for (let i = 0; i < yedanguandatarrtrmp.length; i++) {
                 if ((yedanguandatarrtrmp[i].XStation + '') === stationarr[0] && (yedanguandatarrtrmp[i].YStation +
@@ -2328,11 +2710,16 @@
                 x: 211,
                 y: 107
               })
-            } else {
+            } else if (_this.yedanguanitem === 19) {
               _this.drawyedanguancavans({
                 x: 135,
                 y: 46
               })
+            } else if (_this.yedanguanitem === 21) {
+              _this.drawyedanguancavans({
+                x: 135,
+                y: 35
+              })
             }
           }
         }
@@ -2391,7 +2778,7 @@
             }
           })
       },
-
+      //获取液氮罐图片信息
       getEquipImg(eid) {
         let _this = this
         // 获取容器信息
@@ -2399,17 +2786,19 @@
           .then(res => {
             _this.equipCode = res.data.Code
             _this.equipName = `【容器-${res.data.Name}】`
-            // 4:液氮罐，19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐
+            // 4:液氮罐，19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐；21：贝尔最新型号液氮罐
             if (res.data && (res.data.DItem === 4)) {
               _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)) {
+            } else if (res.data && (res.data.DItem === 19 || res.data.DItem === 20 || res.data.DItem === 21)) {
               _this.yedanguanitem = res.data.DItem
               if (res.data.DItem === 19) {
                 _this.yeshuyedanguanimgid = 'cryobiobank97Kimg'
-              } else {
+              } else if (res.data.DItem === 20) {
                 _this.yeshuyedanguanimgid = 'cryobiobank97K_bloodbagimg'
+              } else {
+                _this.yeshuyedanguanimgid = 'cryobiobank97K_newmodelimg'
               }
               // 加载特殊液氮罐
               _this.drawyedanguancanvasbgimg()
@@ -2444,13 +2833,15 @@
         let yedanguandatarrtrmp = []
         if (_this.yedanguanitem === 20) {
           yedanguandatarrtrmp = _this.yedanguanrongqiarr_13kbloodbag
-        } else {
+        } else if (_this.yedanguanitem === 19){
           yedanguandatarrtrmp = _this.yedanguanrongqiarr
+        } else {
+          yedanguandatarrtrmp = _this.yedanguanrongqiarr_newmodel
         }
         yedanguandatarrtrmp.forEach(function (v) {
           // 绘制颜色快
           if (v.type === 1) { // 标准四边形
-            _this.yedanguanctx.strokeStyle = 'white'
+            _this.yedanguanctx.fillStyle = 'white'
             _this.yedanguanctx.beginPath()
             _this.yedanguanctx.rect(v.x, v.y, v.width, v.height)
             _this.yedanguanctx.stroke()
@@ -2649,7 +3040,7 @@
           if(this.Apply_flag == true) {
             this.sampleTitle = '新增样本'
             this.sampleInfoDialog = true
-          }        
+          }
         }
         this.dchxtable = y
         this.dchytable = x
@@ -2977,7 +3368,7 @@
               let jsonstr = _this.getExtendata()
               // 转换为json对象
               let jsonobj = JSON.parse(jsonstr)
-              // 拼接两个对象             
+              // 拼接两个对象
               let params = _this.sampleForm
               params = Object.assign(params, jsonobj)
               // 位置冰箱等信息
@@ -3612,7 +4003,7 @@
         // minute = second < 10 ? ('0' + second) : second;
         // return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
       },
-      
+
       getGrouplist() {
         let _this = this
         _this.$axios.get('/samplesgroup/grouplist', {})

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

@@ -356,7 +356,7 @@
               _this.formmodel.ModelId = res.data.Id
               _this.formmodel.ModelVersion = res.data.DModel
               _this.formmodel.DItem = res.data.DItem
-              // 19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐
+              // 19：贝尔Cryobiobank13K液氮罐；20：贝尔Cryobiobank13K_BloodBag液氮罐；21：贝尔最新型号液氮罐
               if (_this.isadd) {
                 switch (res.data.DItem) {
                   case 19:
@@ -371,6 +371,12 @@
                     _this.haveshelf = true
                     _this.showdchdcj = false
                     break
+                  case 21:
+                    _this.formmodel.RowNum = '6'
+                    _this.formmodel.ColumnNum = '9'
+                    _this.haveshelf = true
+                    _this.showdchdcj = false
+                    break
                   default:
                     _this.formmodel.RowNum = '1'
                     _this.formmodel.ColumnNum = '1'
@@ -525,8 +531,8 @@
                 })
             } else {
               // 不能修改为特殊型号
-              if ((_this.editdataitem !== 19 && _this.editdataitem !== 20) && (_this.formmodel.DItem === 19 ||
-                  _this.formmodel.DItem === 20)) {
+              if ((_this.editdataitem !== 19 && _this.editdataitem !== 20 && _this.editdataitem !== 21) && (_this.formmodel.DItem === 19 ||
+                  _this.formmodel.DItem === 20 || _this.formmodel.DItem === 21)) {
                 this.$message({
                   type: 'warning',
                   message: '操作失败，不能调整为该设备型号!'

src/dashoo.cn/frontend_animal/src/pages/equipment/_opera/samplestorage.vue

@@ -21,7 +21,7 @@
           <span style="float: right;margin-top:-5px;margin-left: 10px">
             <el-button  type="primary" class="el-button--small" style="margin-left: 0px" onclick="window.history.go(-1)">返回</el-button>
           </span>
-          
+
         </span>
         </span>
       </div>
@@ -47,18 +47,18 @@
                   <div class="ulbgcolor" v-for="g in Math.ceil(selectdtedanguan.ColumnNum / 21)"  style="width:50px;float:left;margin-left:1px">
                     <div v-for="b in selectdtedanguan.ColumnNum">
                       <div class="hoverdiv" v-if="(b <= g*21) && (b > (g - 1)*21)" @click="handleclk(b-1, 0, selectdtedanguan.YStation, selectdtedanguan.XStation)"
-                        v-bind:style="{ 
-                        backgroundColor: xcolor == b && ycolor == 1 && 
-                        xidx == selectdtedanguan.YStation && yidx == selectdtedanguan.XStation ? COLORARR[2] : 
-                        (selectdtedanguan['A'+b] == -2 ? COLORARR[0] : 
-                        (selectdtedanguan['A'+b] == -1 ? COLORARR[1] : 
-                        (selectdtedanguan['A'+b] > 0 && 
-                        selectdtedanguan['A'+b] <= 25 ? COLORARR[3] : 
-                        (selectdtedanguan['A'+b] > 25 && 
-                        selectdtedanguan['A'+b] <= 50 ? COLORARR[4] : 
-                        (selectdtedanguan['A'+b] > 50 && 
-                        selectdtedanguan['A'+b] <= 75 ? COLORARR[5] : 
-                        (selectdtedanguan['A'+b] > 75 ? COLORARR[6] : 
+                        v-bind:style="{
+                        backgroundColor: xcolor == b && ycolor == 1 &&
+                        xidx == selectdtedanguan.YStation && yidx == selectdtedanguan.XStation ? COLORARR[2] :
+                        (selectdtedanguan['A'+b] == -2 ? COLORARR[0] :
+                        (selectdtedanguan['A'+b] == -1 ? COLORARR[1] :
+                        (selectdtedanguan['A'+b] > 0 &&
+                        selectdtedanguan['A'+b] <= 25 ? COLORARR[3] :
+                        (selectdtedanguan['A'+b] > 25 &&
+                        selectdtedanguan['A'+b] <= 50 ? COLORARR[4] :
+                        (selectdtedanguan['A'+b] > 50 &&
+                        selectdtedanguan['A'+b] <= 75 ? COLORARR[5] :
+                        (selectdtedanguan['A'+b] > 75 ? COLORARR[6] :
                         COLORARR[7])))))) }"
                         style="margin: 1px;width:50px; height:20px;"></div>
                     </div>
@@ -71,7 +71,7 @@
                 <thead>
                   <th></th>
                   <th v-for ="ind in colorTableWidth">{{ind}}</th>
-                </thead>  
+                </thead>
                 <tbody>
                   <tr v-for =" (xcolorTable,k1) in colorTableHeight">
                     <td style="text-align:center;font-size:20px;">{{numtoengs[xcolorTable-1]}}</td>
@@ -81,20 +81,20 @@
                           <div v-if="samplelist[index].XStation === k2+1 && samplelist[index].YStation === k1+1">
                             <div v-for="rowindex in samplelist[index].RowNum">
                               <div class="hoverdiv" v-for=" colindex in samplelist[index].ColumnNum">
-                                <div v-bind:style="{ 
+                                <div v-bind:style="{
                                 width: (unitwidth/colorTableWidth/samplelist[index].ColumnNum-2.5) + 'px',
                                 height: (unitheight/colorTableHeight/samplelist[index].RowNum-2.5) + 'px',
-                                backgroundColor: xcolor == colindex && ycolor == rowindex && 
-                                xidx == k1+1 && yidx == k2+1 ? COLORARR[2] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] == -2 ? COLORARR[0] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] == -1 ? COLORARR[1] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 0 && 
-                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 25 ? COLORARR[3] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 25 && 
-                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 50 ? COLORARR[4] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 50 && 
-                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 75 ? COLORARR[5] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 75 ? COLORARR[6] : 
+                                backgroundColor: xcolor == colindex && ycolor == rowindex &&
+                                xidx == k1+1 && yidx == k2+1 ? COLORARR[2] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] == -2 ? COLORARR[0] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] == -1 ? COLORARR[1] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 0 &&
+                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 25 ? COLORARR[3] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 25 &&
+                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 50 ? COLORARR[4] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 50 &&
+                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 75 ? COLORARR[5] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 75 ? COLORARR[6] :
                                 COLORARR[7])))))) }"
                                 style="margin: 1px"
                                 @click="handleclk(colindex-1, rowindex-1, k1+1, k2+1)"></div>
@@ -105,7 +105,7 @@
                       </div>
                     </td>
                   </tr>
-                </tbody>       
+                </tbody>
               </table>
               <div>
                 <img :src="fridgebottomimg" class="fridge">
@@ -161,9 +161,9 @@
             <el-button  type="primary" @click="dialogtiquVisible = true" class="el-button--small" v-if="sampleform.type_flag === 'edit'" style="margin-right:-10px;">提取</el-button>
             <el-button  type="danger" class="el-button--small" v-if="sampleform.type_flag === 'edit'"
              style="margin-right:-10px;" @click="deletedata()">删除</el-button> -->
-            <el-button type="primary" class="el-button--small" 
+            <el-button type="primary" class="el-button--small"
              @click="savesample()" v-if="sampleform.type_flag !== 'edit'">保存</el-button>
-            <el-button  type="primary" class="el-button--small" 
+            <el-button  type="primary" class="el-button--small"
              @click="saveandadd(1)" v-if="sampleform.type_flag !== 'edit' && false">保存并新增</el-button>
             <el-button  type="primary" class="el-button--small" v-if="sampleform.type_flag !== 'edit' && false" @click="saveandadd(2)">保存并新增分管</el-button>
             <el-button  type="primary" class="el-button--small" @click="goAnchor('#equishelfcard')">置顶</el-button>
@@ -175,13 +175,13 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="样本条码" prop="BarCode">
-              <el-input v-model="sampleform.BarCode" placeholder="为空默认自动生成" 
+              <el-input v-model="sampleform.BarCode" placeholder="为空默认自动生成"
               style="width:68%" :disabled="disabledbarcode"></el-input>
               <el-button class="btnbox" :disabled="disabledbtnpreopera" type="primary" style="width:30%" @click="openpreop()">预录入</el-button>
             </el-form-item>
             <el-form-item label="组织器官">
-              <el-cascader :options="organlist2" style="width:100%" :props="sampleorganprops" 
-              change-on-select :show-all-levels="false" v-model="selectedorgan" placeholder="请选择" 
+              <el-cascader :options="organlist2" style="width:100%" :props="sampleorganprops"
+              change-on-select :show-all-levels="false" v-model="selectedorgan" placeholder="请选择"
               @change="chooseorgange" :disabled="disabledsamplingorgan"></el-cascader>
             </el-form-item>
             <el-form-item label="接收日期">
@@ -214,13 +214,13 @@
 
           <el-col :span="8">
             <el-form-item label="样本类型" required prop="SampleTypestr">
-              <el-select v-model="sampleform.SampleTypestr" placeholder="请选择" 
+              <el-select v-model="sampleform.SampleTypestr" placeholder="请选择"
               style="width:100%" @change="choosetype" :disabled="disabledsampletype">
                 <el-option v-for="item in sampletypelist" :label="item.label" :value="item.value"  :key="item.value"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="取材部位">
-              <el-select v-model="sampleform.SamplingSite" placeholder="取材部位" 
+              <el-select v-model="sampleform.SamplingSite" placeholder="取材部位"
               style="width:100%" :disabled="disabledsamplingsite">
                 <el-option v-for="item in samplequcailist" :label="item.label" :value="item.value" :key="item.value"></el-option>
               </el-select>
@@ -249,7 +249,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="样本来源">
-              <el-input v-model="sampleform.SourceName" placeholder="样本来源" 
+              <el-input v-model="sampleform.SourceName" placeholder="样本来源"
               style="width:68%" disabled="true"></el-input>
               <el-button type="primary" :disabled="disabledsourcebutton" style="width:30%" @click="dialogFormVisible2 = true" class="btnbox">选择</el-button>
             </el-form-item>
@@ -263,7 +263,7 @@
             <el-form-item>
               <el-checkbox :disabled="disabledcheckprint" v-model="sampleform.autoprintchecked" class="title">
                 新增保存时打印标签(如若勾选，请确保已经设置过默认打印方案)
-              </el-checkbox>  
+              </el-checkbox>
             </el-form-item>
           </el-col>
 
@@ -272,7 +272,7 @@
               <i class="icon icon-paragraph-justify"></i> 样本公共扩展
             </div>
             <div>
-              <div class="four fields" style="margin-top:25px;"> 
+              <div class="four fields" style="margin-top:25px;">
                 <el-row>
                   <el-col :span="8" v-for="item in publickzlist" :key="item">
                     <el-form-item :label="item.Name">
@@ -292,7 +292,7 @@
               <i class="icon icon-paragraph-justify"></i> 样本特有扩展
             </div>
             <div>
-              <div class="four fields" style="margin-top:25px;"> 
+              <div class="four fields" style="margin-top:25px;">
                 <el-row>
                   <el-col :span="8" v-for="item in typetykzlist" :key="item">
                     <el-form-item :label="item.Name">
@@ -315,15 +315,15 @@
             <el-button @click="editsave()" type="primary" class="el-button--small" v-if="sampleform.type_flag === 'edit'" >保存</el-button>
             <!-- <el-button  type="danger" class="el-button--small" v-if="sampleform.type_flag === 'edit'"
              style="margin-right:-10px;" @click="deletedata()">删除</el-button> -->
-            <el-button type="primary" class="el-button--small" 
+            <el-button type="primary" class="el-button--small"
              @click="savesample()" v-if="sampleform.type_flag !== 'edit'">保存</el-button>
-            <el-button  type="primary" class="el-button--small" 
+            <el-button  type="primary" class="el-button--small"
             style="margin-right:-10px;" @click="saveandadd(1)" v-if="sampleform.type_flag !== 'edit' && false">保存并新增</el-button>
             <el-button  type="primary" class="el-button--small" v-if="sampleform.type_flag !== 'edit' && false" @click="saveandadd(2)">保存并新增分管</el-button>
             <el-button  type="primary" class="el-button--small" @click="goAnchor('#equishelfcard')">置顶</el-button>
           </span>
         </span>
-      </el-row>    
+      </el-row>
     </el-card>
 
     <el-dialog title="样本批量导入" :visible.sync="exportVisible">
@@ -975,8 +975,10 @@
               _this.yedanguanitem = res.data.DItem
               if (res.data.DItem === 19) {
                 _this.yeshuyedanguanimgid = 'cryobiobank97Kimg'
-              } else {
+              } else if (res.data.DItem === 20) {
                 _this.yeshuyedanguanimgid = 'cryobiobank97K_bloodbagimg'
+              } else {
+                _this.yeshuyedanguanimgid = 'cryobiobank97K_newmodelimg'
               }
               // 加载特殊液氮罐
               _this.drawyedanguancanvasbgimg()
@@ -1851,7 +1853,7 @@
 
 <style lang="scss" scoped>
   .ulbgcolor div{
-    float: left; 
+    float: left;
   }
   .hoverdiv:hover{ box-shadow: 0 0 4px rgba(0,0,0,.4); transform: scale(1.15); }
   .tablebox{
@@ -1893,7 +1895,7 @@
   .worklisticolist i{
     margin-right: 3px;
   }
-  
+
   .tdborder {
     border: 1px solid #A2B5CD;
   }

src/dashoo.cn/frontend_animal/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" :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" :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>