web页面添加液氮罐

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

@@ -2983,8 +2983,8 @@
               })
             } else if (_this.yedanguanitem === 21) {
               _this.drawyedanguancavans({
-                x: 135,
-                y: 35
+                x: 125,
+                y: 25
               })
             }
           }

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

@@ -2721,8 +2721,8 @@
               })
             } else if (_this.yedanguanitem === 21) {
               _this.drawyedanguancavans({
-                x: 135,
-                y: 35
+                x: 125,
+                y: 25
               })
             }
           }

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

@@ -1483,8 +1483,8 @@
               })
             } else if (_this.yedanguanitem === 21) {
               _this.drawyedanguancavans({
-                x: 135,
-                y: 35
+                x: 125,
+                y: 25
               })
             }
           }

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

@@ -12,7 +12,7 @@
       <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;"
+      <img src="/img/cryobiobank97K_newmodel.png" 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">

src/dashoo.cn/frontend_web/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: 125,
+            y: 25,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 1,
+            x: 158,
+            y: 20,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 1,
+            x: 192,
+            y: 20,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 1,
+            x: 65,
+            y: 88,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 1,
+            x: 100,
+            y: 58,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 1,
+            x: 163,
+            y: 58,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 2,
+            x: 36,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 2,
+            x: 100,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 2,
+            x: 163,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 2,
+            x: 18,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 2,
+            x: 82,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 2,
+            x: 145,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 7,
+            YStation: 2,
+            x: 37,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 8,
+            YStation: 2,
+            x: 101,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 9,
+            YStation: 2,
+            x: 163,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 3,
+            x: 64,
+            y: 336,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 3,
+            x: 127,
+            y: 397,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 3,
+            x: 160,
+            y: 401,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 3,
+            x: 194,
+            y: 401,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 3,
+            x: 100,
+            y: 336,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 3,
+            x: 163,
+            y: 336,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 4,
+            x: 358,
+            y: 336,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 4,
+            x: 231,
+            y: 401,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 4,
+            x: 263,
+            y: 401,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 4,
+            x: 297,
+            y: 397,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 4,
+            x: 230,
+            y: 336,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 4,
+            x: 294,
+            y: 336,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 5,
+            x: 230,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 5,
+            x: 294,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 5,
+            x: 358,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 5,
+            x: 247,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 5,
+            x: 311,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 5,
+            x: 374,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 7,
+            YStation: 5,
+            x: 231,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 8,
+            YStation: 5,
+            x: 294,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 9,
+            YStation: 5,
+            x: 358,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 6,
+            x: 230,
+            y: 20,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 6,
+            x: 263,
+            y: 20,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 6,
+            x: 296,
+            y: 25,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 6,
+            x: 358,
+            y: 88,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 6,
+            x: 230,
+            y: 58,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 6,
+            x: 294,
+            y: 58,
+            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) {
           // 绘制颜色快
@@ -2455,12 +2837,14 @@
               _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 +
@@ -2590,11 +2976,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: 125,
+                y: 25
+              })
             }
           }
         }
@@ -2745,7 +3136,7 @@
               // if(_this.acc =='sBBo4' || _this.acc == 'ssqOy'){
               let sampletypestr = _this.sampleform.SampleTypestr
               _this.getautobarcode(sampletypestr)
-              // }  
+              // }
             })
         }
       },

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

@@ -640,7 +640,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不规则图形
         ],
         yedanguanrongqiarr_13kbloodbag: [ // 20：贝尔Cryobiobank13K_BloodBag液氮罐
@@ -811,8 +811,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) {
           // 绘制颜色快
@@ -923,12 +925,14 @@
               _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()
@@ -1022,8 +1026,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 +
@@ -1058,11 +1064,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: 125,
+                y: 25
+              })
             }
           }
         }
@@ -1213,7 +1224,7 @@
               // if(_this.acc =='sBBo4' || _this.acc == 'ssqOy'){
               let sampletypestr = _this.sampleform.SampleTypestr
               _this.getautobarcode(sampletypestr)
-              // }  
+              // }
             })
         }
       },

src/dashoo.cn/frontend_web/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>
@@ -842,7 +842,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,
@@ -2231,8 +2231,8 @@
           {
             XStation: 1,
             YStation: 1,
-            x: 135,
-            y: 35,
+            x: 125,
+            y: 25,
             width: 28,
             height: 28,
             type: 1
@@ -2240,8 +2240,8 @@
           {
             XStation: 2,
             YStation: 1,
-            x: 170,
-            y: 30,
+            x: 158,
+            y: 20,
             width: 28,
             height: 28,
             type: 1
@@ -2249,8 +2249,8 @@
           {
             XStation: 3,
             YStation: 1,
-            x: 198,
-            y: 30,
+            x: 192,
+            y: 20,
             width: 28,
             height: 28,
             type: 1
@@ -2258,8 +2258,8 @@
           {
             XStation: 4,
             YStation: 1,
-            x: 77,
-            y: 97,
+            x: 65,
+            y: 88,
             width: 28,
             height: 28,
             type: 1
@@ -2267,8 +2267,8 @@
           {
             XStation: 5,
             YStation: 1,
-            x: 110,
-            y: 65,
+            x: 100,
+            y: 58,
             width: 56,
             height: 56,
             type: 1
@@ -2276,8 +2276,8 @@
           {
             XStation: 6,
             YStation: 1,
-            x: 168,
-            y: 65,
+            x: 163,
+            y: 58,
             width: 56,
             height: 56,
             type: 1
@@ -2285,8 +2285,8 @@
           {
             XStation: 1,
             YStation: 2,
-            x: 50,
-            y: 130,
+            x: 36,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2294,8 +2294,8 @@
           {
             XStation: 2,
             YStation: 2,
-            x: 106,
-            y: 130,
+            x: 100,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2303,8 +2303,8 @@
           {
             XStation: 3,
             YStation: 2,
-            x: 166,
-            y: 130,
+            x: 163,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2312,8 +2312,8 @@
           {
             XStation: 4,
             YStation: 2,
-            x: 30,
-            y: 195,
+            x: 18,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2321,8 +2321,8 @@
           {
             XStation: 5,
             YStation: 2,
-            x: 86,
-            y: 195,
+            x: 82,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2330,8 +2330,8 @@
           {
             XStation: 6,
             YStation: 2,
-            x: 150,
-            y: 195,
+            x: 145,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2339,8 +2339,8 @@
           {
             XStation: 7,
             YStation: 2,
-            x: 50,
-            y: 258,
+            x: 37,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2348,8 +2348,8 @@
           {
             XStation: 8,
             YStation: 2,
-            x: 106,
-            y: 258,
+            x: 101,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2357,8 +2357,8 @@
           {
             XStation: 9,
             YStation: 2,
-            x: 166,
-            y: 258,
+            x: 163,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2366,8 +2366,8 @@
           {
             XStation: 1,
             YStation: 3,
-            x: 78,
-            y: 321,
+            x: 64,
+            y: 336,
             width: 28,
             height: 28,
             type: 1
@@ -2375,8 +2375,8 @@
           {
             XStation: 2,
             YStation: 3,
-            x: 136,
-            y: 384,
+            x: 127,
+            y: 397,
             width: 28,
             height: 28,
             type: 1
@@ -2384,8 +2384,8 @@
           {
             XStation: 3,
             YStation: 3,
-            x: 169,
-            y: 384,
+            x: 160,
+            y: 401,
             width: 28,
             height: 28,
             type: 1
@@ -2393,8 +2393,8 @@
           {
             XStation: 4,
             YStation: 3,
-            x: 200,
-            y: 384,
+            x: 194,
+            y: 401,
             width: 28,
             height: 28,
             type: 1
@@ -2402,8 +2402,8 @@
           {
             XStation: 5,
             YStation: 3,
-            x: 110,
-            y: 321,
+            x: 100,
+            y: 336,
             width: 56,
             height: 56,
             type: 1
@@ -2411,8 +2411,8 @@
           {
             XStation: 6,
             YStation: 3,
-            x: 170,
-            y: 321,
+            x: 163,
+            y: 336,
             width: 56,
             height: 56,
             type: 1
@@ -2420,8 +2420,8 @@
           {
             XStation: 1,
             YStation: 4,
-            x: 348,
-            y: 321,
+            x: 358,
+            y: 336,
             width: 28,
             height: 28,
             type: 1
@@ -2429,8 +2429,8 @@
           {
             XStation: 2,
             YStation: 4,
-            x: 230,
-            y: 384,
+            x: 231,
+            y: 401,
             width: 28,
             height: 28,
             type: 1
@@ -2438,8 +2438,8 @@
           {
             XStation: 3,
             YStation: 4,
-            x: 260,
-            y: 384,
+            x: 263,
+            y: 401,
             width: 28,
             height: 28,
             type: 1
@@ -2447,8 +2447,8 @@
           {
             XStation: 4,
             YStation: 4,
-            x: 289,
-            y: 384,
+            x: 297,
+            y: 397,
             width: 28,
             height: 28,
             type: 1
@@ -2457,7 +2457,7 @@
             XStation: 5,
             YStation: 4,
             x: 230,
-            y: 321,
+            y: 336,
             width: 56,
             height: 56,
             type: 1
@@ -2465,8 +2465,8 @@
           {
             XStation: 6,
             YStation: 4,
-            x: 289,
-            y: 321,
+            x: 294,
+            y: 336,
             width: 56,
             height: 56,
             type: 1
@@ -2475,7 +2475,7 @@
             XStation: 1,
             YStation: 5,
             x: 230,
-            y: 130,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2483,8 +2483,8 @@
           {
             XStation: 2,
             YStation: 5,
-            x: 290,
-            y: 130,
+            x: 294,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2492,8 +2492,8 @@
           {
             XStation: 3,
             YStation: 5,
-            x: 348,
-            y: 130,
+            x: 358,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2501,8 +2501,8 @@
           {
             XStation: 4,
             YStation: 5,
-            x: 250,
-            y: 195,
+            x: 247,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2510,8 +2510,8 @@
           {
             XStation: 5,
             YStation: 5,
-            x: 310,
-            y: 195,
+            x: 311,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2519,8 +2519,8 @@
           {
             XStation: 6,
             YStation: 5,
-            x: 368,
-            y: 195,
+            x: 374,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2529,7 +2529,7 @@
             XStation: 7,
             YStation: 5,
             x: 231,
-            y: 258,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2537,8 +2537,8 @@
           {
             XStation: 8,
             YStation: 5,
-            x: 290,
-            y: 258,
+            x: 294,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2546,8 +2546,8 @@
           {
             XStation: 9,
             YStation: 5,
-            x: 350,
-            y: 258,
+            x: 358,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2555,8 +2555,8 @@
           {
             XStation: 1,
             YStation: 6,
-            x: 232,
-            y: 30,
+            x: 230,
+            y: 20,
             width: 28,
             height: 28,
             type: 1
@@ -2564,8 +2564,8 @@
           {
             XStation: 2,
             YStation: 6,
-            x: 260,
-            y: 30,
+            x: 263,
+            y: 20,
             width: 28,
             height: 28,
             type: 1
@@ -2573,8 +2573,8 @@
           {
             XStation: 3,
             YStation: 6,
-            x: 290,
-            y: 35,
+            x: 296,
+            y: 25,
             width: 28,
             height: 28,
             type: 1
@@ -2582,8 +2582,8 @@
           {
             XStation: 4,
             YStation: 6,
-            x: 348,
-            y: 97,
+            x: 358,
+            y: 88,
             width: 28,
             height: 28,
             type: 1
@@ -2592,7 +2592,7 @@
             XStation: 5,
             YStation: 6,
             x: 230,
-            y: 65,
+            y: 58,
             width: 56,
             height: 56,
             type: 1
@@ -2600,8 +2600,8 @@
           {
             XStation: 6,
             YStation: 6,
-            x: 290,
-            y: 65,
+            x: 294,
+            y: 58,
             width: 56,
             height: 56,
             type: 1
@@ -2659,7 +2659,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 => {
@@ -2723,8 +2723,8 @@
               })
             } else if (_this.yedanguanitem === 21) {
               _this.drawyedanguancavans({
-                x: 135,
-                y: 35
+                x: 125,
+                y: 25
               })
             }
           }
@@ -3382,7 +3382,7 @@
               let jsonstr = _this.getExtendata()
               // 转换为json对象
               let jsonobj = JSON.parse(jsonstr)
-              // 拼接两个对象             
+              // 拼接两个对象
               let params = _this.sampleForm
               params = Object.assign(params, jsonobj)
               // 位置冰箱等信息

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

@@ -36,7 +36,7 @@
               <el-input v-model="formmodel.Code"></el-input>
             </el-form-item>
             <el-form-item label="品牌" required>
-              <el-select :disabled="!isadd && (formmodel.DItem === 19 || formmodel.DItem === 20)"
+              <el-select :disabled="!isadd && (formmodel.DItem === 19 || formmodel.DItem === 20 || formmodel.DItem === 21)"
                 v-model="formmodel.Brand" placeholder="请选择品牌" @change="selectDModel" style="width:100%">
                 <el-option v-for="item in brandoptions" :label="item.label" :value="item.value" :key="item.value">
                 </el-option>
@@ -49,7 +49,7 @@
               <el-input v-model="formmodel.Name"></el-input>
             </el-form-item>
             <el-form-item label="型号" required>
-              <el-select :disabled="!isadd && (formmodel.DItem === 19 || formmodel.DItem === 20)"
+              <el-select :disabled="!isadd && (formmodel.DItem === 19 || formmodel.DItem === 20 || formmodel.DItem === 21)"
                 v-model="formmodel.ModelVersion" placeholder="请选择型号" @change="selectPhoto" style="width:100%">
                 <el-option v-for="item in modeloptions" :label="item.label" :value="item.value" :key="item.value">
                 </el-option>
@@ -525,8 +525,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_web/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">
@@ -600,7 +600,7 @@
         yeshuyedanguanimgid: '', // 特殊液氮罐图片Id
         showcgshebei: false, // 显示常规形式
         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, YStation: 1, x: 77, y: 76, width: 53, height: 53, type: 1},
           {XStation: 1, YStation: 1, x: 134, y: 45, width: 84, height: 84, type: 1},
@@ -752,7 +752,387 @@
           {XStation: 31, YStation: 4, x: 228, y: 31, width: 96, height: 7, type: 1},
           {XStation: 32, YStation: 4, x1: 327, y1: 49, x2: 367, y2: 113, x3: 374, y3: 110, x4: 335, y4: 46, type: 2},
           {XStation: 33, YStation: 4, x1: 338, y1: 49, x2: 378, y2: 113, x3: 385, y3: 110, x4: 346, y4: 46, type: 2}
-        ]
+        ],
+        yedanguanrongqiarr_newmodel: [ // 21：贝尔最新型号液氮罐,type:1规则图形，2不规则图形
+          {
+            XStation: 1,
+            YStation: 1,
+            x: 125,
+            y: 25,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 1,
+            x: 158,
+            y: 20,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 1,
+            x: 192,
+            y: 20,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 1,
+            x: 65,
+            y: 88,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 1,
+            x: 100,
+            y: 58,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 1,
+            x: 163,
+            y: 58,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 2,
+            x: 36,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 2,
+            x: 100,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 2,
+            x: 163,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 2,
+            x: 18,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 2,
+            x: 82,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 2,
+            x: 145,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 7,
+            YStation: 2,
+            x: 37,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 8,
+            YStation: 2,
+            x: 101,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 9,
+            YStation: 2,
+            x: 163,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 3,
+            x: 64,
+            y: 336,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 3,
+            x: 127,
+            y: 397,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 3,
+            x: 160,
+            y: 401,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 3,
+            x: 194,
+            y: 401,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 3,
+            x: 100,
+            y: 336,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 3,
+            x: 163,
+            y: 336,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 4,
+            x: 358,
+            y: 336,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 4,
+            x: 231,
+            y: 401,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 4,
+            x: 263,
+            y: 401,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 4,
+            x: 297,
+            y: 397,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 4,
+            x: 230,
+            y: 336,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 4,
+            x: 294,
+            y: 336,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 5,
+            x: 230,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 5,
+            x: 294,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 5,
+            x: 358,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 5,
+            x: 247,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 5,
+            x: 311,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 5,
+            x: 374,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 7,
+            YStation: 5,
+            x: 231,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 8,
+            YStation: 5,
+            x: 294,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 9,
+            YStation: 5,
+            x: 358,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 6,
+            x: 230,
+            y: 20,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 6,
+            x: 263,
+            y: 20,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 6,
+            x: 296,
+            y: 25,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 6,
+            x: 358,
+            y: 88,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 6,
+            x: 230,
+            y: 58,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 6,
+            x: 294,
+            y: 58,
+            width: 56,
+            height: 56,
+            type: 1
+          }
+        ],
       }
     },
     mounted () {
@@ -875,8 +1255,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) {
           // 绘制颜色快
@@ -971,12 +1353,14 @@
               _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()
@@ -1061,8 +1445,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 + '') === stationarr[1]) {
@@ -1086,9 +1472,20 @@
           // 初始化特殊形态的液氮罐
           if (_this.showtsyedanguan) {
             if (_this.yedanguanitem === 20) {
-              _this.drawyedanguancavans({x: 211, y: 107})
-            } else {
-              _this.drawyedanguancavans({x: 135, y: 46})
+              _this.drawyedanguancavans({
+                x: 211,
+                y: 107
+              })
+            } else if (_this.yedanguanitem === 19) {
+              _this.drawyedanguancavans({
+                x: 135,
+                y: 46
+              })
+            } else if (_this.yedanguanitem === 21) {
+              _this.drawyedanguancavans({
+                x: 125,
+                y: 25
+              })
             }
           }
         }
@@ -1851,7 +2248,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 +2290,7 @@
   .worklisticolist i{
     margin-right: 3px;
   }
-  
+
   .tdborder {
     border: 1px solid #A2B5CD;
   }

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

@@ -42,8 +42,8 @@
                 <p class="devplab" style="height:17px;overflow:hidden;white-space:nowrap;" :title="v.Equipment.Brand">品牌：{{v.Equipment.Brand}}</p>
                 <p class="devplab" style="height:17px;overflow:hidden;white-space:nowrap;" :title="v.Equipment.ModelVersion">型号：{{v.Equipment.ModelVersion}}</p>
                 <p class="devplab">样本的数量：{{v.SampleCount}}</p>
-                <p class="devplab">冻存架数量：{{v.ShelfCount}}</p>
-                <p class="devplab">冻存盒数量：{{v.BoxCount}}</p>
+                <p class="devplab">冻存架数量：{{v.Equipment.ModelVersion == "Cryobiobank13K_NewModel" ? 42 : v.ShelfCount}}</p>
+                <p class="devplab">冻存盒数量：{{v.Equipment.ModelVersion == "Cryobiobank13K_NewModel" ? 546 : v.BoxCount}}</p>
               </el-col>
               <el-col :span="9">
                 <router-link :to="'/equipment/' + v.Equipment.Id + '/manage_new?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
@@ -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>

src/dashoo.cn/frontend_web/src/pages/samples/waitingstore/_opera/unsave.vue

@@ -55,18 +55,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>
@@ -89,20 +89,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>
                               </div>
@@ -206,7 +206,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,
@@ -1591,6 +1591,386 @@
             type: 2
           }
         ],
+        yedanguanrongqiarr_newmodel: [ // 21：贝尔最新型号液氮罐,type:1规则图形，2不规则图形
+          {
+            XStation: 1,
+            YStation: 1,
+            x: 125,
+            y: 25,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 1,
+            x: 158,
+            y: 20,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 1,
+            x: 192,
+            y: 20,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 1,
+            x: 65,
+            y: 88,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 1,
+            x: 100,
+            y: 58,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 1,
+            x: 163,
+            y: 58,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 2,
+            x: 36,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 2,
+            x: 100,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 2,
+            x: 163,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 2,
+            x: 18,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 2,
+            x: 82,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 2,
+            x: 145,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 7,
+            YStation: 2,
+            x: 37,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 8,
+            YStation: 2,
+            x: 101,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 9,
+            YStation: 2,
+            x: 163,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 3,
+            x: 64,
+            y: 336,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 3,
+            x: 127,
+            y: 397,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 3,
+            x: 160,
+            y: 401,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 3,
+            x: 194,
+            y: 401,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 3,
+            x: 100,
+            y: 336,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 3,
+            x: 163,
+            y: 336,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 4,
+            x: 358,
+            y: 336,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 4,
+            x: 231,
+            y: 401,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 4,
+            x: 263,
+            y: 401,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 4,
+            x: 297,
+            y: 397,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 4,
+            x: 230,
+            y: 336,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 4,
+            x: 294,
+            y: 336,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 5,
+            x: 230,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 5,
+            x: 294,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 5,
+            x: 358,
+            y: 128,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 5,
+            x: 247,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 5,
+            x: 311,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 5,
+            x: 374,
+            y: 197,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 7,
+            YStation: 5,
+            x: 231,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 8,
+            YStation: 5,
+            x: 294,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 9,
+            YStation: 5,
+            x: 358,
+            y: 264,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 6,
+            x: 230,
+            y: 20,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 6,
+            x: 263,
+            y: 20,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 6,
+            x: 296,
+            y: 25,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 6,
+            x: 358,
+            y: 88,
+            width: 28,
+            height: 28,
+            type: 1
+          },
+          {
+            XStation: 5,
+            YStation: 6,
+            x: 230,
+            y: 58,
+            width: 56,
+            height: 56,
+            type: 1
+          },
+          {
+            XStation: 6,
+            YStation: 6,
+            x: 294,
+            y: 58,
+            width: 56,
+            height: 56,
+            type: 1
+          }
+        ],
         isfristhavepos: false, // 有保留位置信息，且是第一次加载
         urlparams: [], // 所传的参数
         urlparamsstr: '' // 所传的参数
@@ -1647,8 +2027,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) === _this.yidx && (yedanguandatarrtrmp[i].YStation) === _this.xidx) {
@@ -1689,12 +2071,14 @@
               _this.showtsyedanguan = false
               _this.showcgshebei = true
               _this.fridgebottomimg = _this.imghost + '/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()
@@ -1733,8 +2117,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) {
           // 绘制颜色快