动物界面液氮罐完善

src/dashoo.cn/frontend_animal/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_animal/src/pages/equipment/_opera/manage.vue

@@ -2189,8 +2189,8 @@
           {
             XStation: 1,
             YStation: 1,
-            x: 77,
-            y: 45,
+            x: 125,
+            y: 25,
             width: 28,
             height: 28,
             type: 1
@@ -2198,8 +2198,8 @@
           {
             XStation: 2,
             YStation: 1,
-            x: 134,
-            y: 45,
+            x: 158,
+            y: 20,
             width: 28,
             height: 28,
             type: 1
@@ -2207,8 +2207,8 @@
           {
             XStation: 3,
             YStation: 1,
-            x: 122,
-            y: 133,
+            x: 192,
+            y: 20,
             width: 28,
             height: 28,
             type: 1
@@ -2216,8 +2216,8 @@
           {
             XStation: 4,
             YStation: 1,
-            x: 33,
-            y: 133,
+            x: 65,
+            y: 88,
             width: 28,
             height: 28,
             type: 1
@@ -2225,8 +2225,8 @@
           {
             XStation: 5,
             YStation: 1,
-            x: 33,
-            y: 133,
+            x: 100,
+            y: 58,
             width: 56,
             height: 56,
             type: 1
@@ -2234,8 +2234,8 @@
           {
             XStation: 6,
             YStation: 1,
-            x: 33,
-            y: 133,
+            x: 163,
+            y: 58,
             width: 56,
             height: 56,
             type: 1
@@ -2243,8 +2243,8 @@
           {
             XStation: 1,
             YStation: 2,
-            x: 34,
-            y: 234,
+            x: 36,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2252,8 +2252,8 @@
           {
             XStation: 2,
             YStation: 2,
-            x: 123,
-            y: 234,
+            x: 100,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2261,8 +2261,8 @@
           {
             XStation: 3,
             YStation: 2,
-            x: 135,
-            y: 322,
+            x: 163,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2270,8 +2270,8 @@
           {
             XStation: 4,
             YStation: 2,
-            x: 77,
-            y: 322,
+            x: 18,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2279,8 +2279,8 @@
           {
             XStation: 5,
             YStation: 2,
-            x: 77,
-            y: 322,
+            x: 82,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2288,8 +2288,8 @@
           {
             XStation: 6,
             YStation: 2,
-            x: 77,
-            y: 322,
+            x: 145,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2297,8 +2297,8 @@
           {
             XStation: 7,
             YStation: 2,
-            x: 77,
-            y: 322,
+            x: 37,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2306,8 +2306,8 @@
           {
             XStation: 8,
             YStation: 2,
-            x: 77,
-            y: 322,
+            x: 101,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2315,8 +2315,8 @@
           {
             XStation: 9,
             YStation: 2,
-            x: 77,
-            y: 322,
+            x: 163,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2324,8 +2324,8 @@
           {
             XStation: 1,
             YStation: 3,
-            x: 77,
-            y: 76,
+            x: 64,
+            y: 336,
             width: 28,
             height: 28,
             type: 1
@@ -2333,8 +2333,8 @@
           {
             XStation: 2,
             YStation: 3,
-            x: 134,
-            y: 45,
+            x: 127,
+            y: 397,
             width: 28,
             height: 28,
             type: 1
@@ -2342,8 +2342,8 @@
           {
             XStation: 3,
             YStation: 3,
-            x: 122,
-            y: 133,
+            x: 160,
+            y: 401,
             width: 28,
             height: 28,
             type: 1
@@ -2351,8 +2351,8 @@
           {
             XStation: 4,
             YStation: 3,
-            x: 33,
-            y: 133,
+            x: 194,
+            y: 401,
             width: 28,
             height: 28,
             type: 1
@@ -2360,8 +2360,8 @@
           {
             XStation: 5,
             YStation: 3,
-            x: 33,
-            y: 133,
+            x: 100,
+            y: 336,
             width: 56,
             height: 56,
             type: 1
@@ -2369,8 +2369,8 @@
           {
             XStation: 6,
             YStation: 3,
-            x: 33,
-            y: 133,
+            x: 163,
+            y: 336,
             width: 56,
             height: 56,
             type: 1
@@ -2378,8 +2378,8 @@
           {
             XStation: 1,
             YStation: 4,
-            x: 77,
-            y: 76,
+            x: 358,
+            y: 336,
             width: 28,
             height: 28,
             type: 1
@@ -2387,8 +2387,8 @@
           {
             XStation: 2,
             YStation: 4,
-            x: 134,
-            y: 45,
+            x: 231,
+            y: 401,
             width: 28,
             height: 28,
             type: 1
@@ -2396,8 +2396,8 @@
           {
             XStation: 3,
             YStation: 4,
-            x: 122,
-            y: 133,
+            x: 263,
+            y: 401,
             width: 28,
             height: 28,
             type: 1
@@ -2405,8 +2405,8 @@
           {
             XStation: 4,
             YStation: 4,
-            x: 33,
-            y: 133,
+            x: 297,
+            y: 397,
             width: 28,
             height: 28,
             type: 1
@@ -2414,8 +2414,8 @@
           {
             XStation: 5,
             YStation: 4,
-            x: 33,
-            y: 133,
+            x: 230,
+            y: 336,
             width: 56,
             height: 56,
             type: 1
@@ -2423,8 +2423,8 @@
           {
             XStation: 6,
             YStation: 4,
-            x: 33,
-            y: 133,
+            x: 294,
+            y: 336,
             width: 56,
             height: 56,
             type: 1
@@ -2432,8 +2432,8 @@
           {
             XStation: 1,
             YStation: 5,
-            x: 34,
-            y: 234,
+            x: 230,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2441,8 +2441,8 @@
           {
             XStation: 2,
             YStation: 5,
-            x: 123,
-            y: 234,
+            x: 294,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2450,8 +2450,8 @@
           {
             XStation: 3,
             YStation: 5,
-            x: 135,
-            y: 322,
+            x: 358,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2459,8 +2459,8 @@
           {
             XStation: 4,
             YStation: 5,
-            x: 77,
-            y: 322,
+            x: 247,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2468,8 +2468,8 @@
           {
             XStation: 5,
             YStation: 5,
-            x: 77,
-            y: 322,
+            x: 311,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2477,8 +2477,8 @@
           {
             XStation: 6,
             YStation: 5,
-            x: 77,
-            y: 322,
+            x: 374,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2486,8 +2486,8 @@
           {
             XStation: 7,
             YStation: 5,
-            x: 77,
-            y: 322,
+            x: 231,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2495,8 +2495,8 @@
           {
             XStation: 8,
             YStation: 5,
-            x: 77,
-            y: 322,
+            x: 294,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2504,8 +2504,8 @@
           {
             XStation: 9,
             YStation: 5,
-            x: 77,
-            y: 322,
+            x: 358,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2513,8 +2513,8 @@
           {
             XStation: 1,
             YStation: 6,
-            x: 77,
-            y: 76,
+            x: 230,
+            y: 20,
             width: 28,
             height: 28,
             type: 1
@@ -2522,8 +2522,8 @@
           {
             XStation: 2,
             YStation: 6,
-            x: 134,
-            y: 45,
+            x: 263,
+            y: 20,
             width: 28,
             height: 28,
             type: 1
@@ -2531,8 +2531,8 @@
           {
             XStation: 3,
             YStation: 6,
-            x: 122,
-            y: 133,
+            x: 296,
+            y: 25,
             width: 28,
             height: 28,
             type: 1
@@ -2540,8 +2540,8 @@
           {
             XStation: 4,
             YStation: 6,
-            x: 33,
-            y: 133,
+            x: 358,
+            y: 88,
             width: 28,
             height: 28,
             type: 1
@@ -2549,8 +2549,8 @@
           {
             XStation: 5,
             YStation: 6,
-            x: 33,
-            y: 133,
+            x: 230,
+            y: 58,
             width: 56,
             height: 56,
             type: 1
@@ -2558,8 +2558,8 @@
           {
             XStation: 6,
             YStation: 6,
-            x: 33,
-            y: 133,
+            x: 294,
+            y: 58,
             width: 56,
             height: 56,
             type: 1
@@ -2976,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: 135,
+                y: 35
+              })
             }
           }
         }

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

@@ -2229,8 +2229,8 @@
           {
             XStation: 1,
             YStation: 1,
-            x: 135,
-            y: 35,
+            x: 125,
+            y: 25,
             width: 28,
             height: 28,
             type: 1
@@ -2238,8 +2238,8 @@
           {
             XStation: 2,
             YStation: 1,
-            x: 170,
-            y: 30,
+            x: 158,
+            y: 20,
             width: 28,
             height: 28,
             type: 1
@@ -2247,8 +2247,8 @@
           {
             XStation: 3,
             YStation: 1,
-            x: 198,
-            y: 30,
+            x: 192,
+            y: 20,
             width: 28,
             height: 28,
             type: 1
@@ -2256,8 +2256,8 @@
           {
             XStation: 4,
             YStation: 1,
-            x: 77,
-            y: 97,
+            x: 65,
+            y: 88,
             width: 28,
             height: 28,
             type: 1
@@ -2265,8 +2265,8 @@
           {
             XStation: 5,
             YStation: 1,
-            x: 110,
-            y: 65,
+            x: 100,
+            y: 58,
             width: 56,
             height: 56,
             type: 1
@@ -2274,8 +2274,8 @@
           {
             XStation: 6,
             YStation: 1,
-            x: 168,
-            y: 65,
+            x: 163,
+            y: 58,
             width: 56,
             height: 56,
             type: 1
@@ -2283,8 +2283,8 @@
           {
             XStation: 1,
             YStation: 2,
-            x: 50,
-            y: 130,
+            x: 36,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2292,8 +2292,8 @@
           {
             XStation: 2,
             YStation: 2,
-            x: 106,
-            y: 130,
+            x: 100,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2301,8 +2301,8 @@
           {
             XStation: 3,
             YStation: 2,
-            x: 166,
-            y: 130,
+            x: 163,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2310,8 +2310,8 @@
           {
             XStation: 4,
             YStation: 2,
-            x: 30,
-            y: 195,
+            x: 18,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2319,8 +2319,8 @@
           {
             XStation: 5,
             YStation: 2,
-            x: 86,
-            y: 195,
+            x: 82,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2328,8 +2328,8 @@
           {
             XStation: 6,
             YStation: 2,
-            x: 150,
-            y: 195,
+            x: 145,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2337,8 +2337,8 @@
           {
             XStation: 7,
             YStation: 2,
-            x: 50,
-            y: 258,
+            x: 37,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2346,8 +2346,8 @@
           {
             XStation: 8,
             YStation: 2,
-            x: 106,
-            y: 258,
+            x: 101,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2355,8 +2355,8 @@
           {
             XStation: 9,
             YStation: 2,
-            x: 166,
-            y: 258,
+            x: 163,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2364,8 +2364,8 @@
           {
             XStation: 1,
             YStation: 3,
-            x: 78,
-            y: 321,
+            x: 64,
+            y: 336,
             width: 28,
             height: 28,
             type: 1
@@ -2373,8 +2373,8 @@
           {
             XStation: 2,
             YStation: 3,
-            x: 136,
-            y: 384,
+            x: 127,
+            y: 397,
             width: 28,
             height: 28,
             type: 1
@@ -2382,8 +2382,8 @@
           {
             XStation: 3,
             YStation: 3,
-            x: 169,
-            y: 384,
+            x: 160,
+            y: 401,
             width: 28,
             height: 28,
             type: 1
@@ -2391,8 +2391,8 @@
           {
             XStation: 4,
             YStation: 3,
-            x: 200,
-            y: 384,
+            x: 194,
+            y: 401,
             width: 28,
             height: 28,
             type: 1
@@ -2400,8 +2400,8 @@
           {
             XStation: 5,
             YStation: 3,
-            x: 110,
-            y: 321,
+            x: 100,
+            y: 336,
             width: 56,
             height: 56,
             type: 1
@@ -2409,8 +2409,8 @@
           {
             XStation: 6,
             YStation: 3,
-            x: 170,
-            y: 321,
+            x: 163,
+            y: 336,
             width: 56,
             height: 56,
             type: 1
@@ -2418,8 +2418,8 @@
           {
             XStation: 1,
             YStation: 4,
-            x: 348,
-            y: 321,
+            x: 358,
+            y: 336,
             width: 28,
             height: 28,
             type: 1
@@ -2427,8 +2427,8 @@
           {
             XStation: 2,
             YStation: 4,
-            x: 230,
-            y: 384,
+            x: 231,
+            y: 401,
             width: 28,
             height: 28,
             type: 1
@@ -2436,8 +2436,8 @@
           {
             XStation: 3,
             YStation: 4,
-            x: 260,
-            y: 384,
+            x: 263,
+            y: 401,
             width: 28,
             height: 28,
             type: 1
@@ -2445,8 +2445,8 @@
           {
             XStation: 4,
             YStation: 4,
-            x: 289,
-            y: 384,
+            x: 297,
+            y: 397,
             width: 28,
             height: 28,
             type: 1
@@ -2455,7 +2455,7 @@
             XStation: 5,
             YStation: 4,
             x: 230,
-            y: 321,
+            y: 336,
             width: 56,
             height: 56,
             type: 1
@@ -2463,8 +2463,8 @@
           {
             XStation: 6,
             YStation: 4,
-            x: 289,
-            y: 321,
+            x: 294,
+            y: 336,
             width: 56,
             height: 56,
             type: 1
@@ -2473,7 +2473,7 @@
             XStation: 1,
             YStation: 5,
             x: 230,
-            y: 130,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2481,8 +2481,8 @@
           {
             XStation: 2,
             YStation: 5,
-            x: 290,
-            y: 130,
+            x: 294,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2490,8 +2490,8 @@
           {
             XStation: 3,
             YStation: 5,
-            x: 348,
-            y: 130,
+            x: 358,
+            y: 128,
             width: 56,
             height: 56,
             type: 1
@@ -2499,8 +2499,8 @@
           {
             XStation: 4,
             YStation: 5,
-            x: 250,
-            y: 195,
+            x: 247,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2508,8 +2508,8 @@
           {
             XStation: 5,
             YStation: 5,
-            x: 310,
-            y: 195,
+            x: 311,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2517,8 +2517,8 @@
           {
             XStation: 6,
             YStation: 5,
-            x: 368,
-            y: 195,
+            x: 374,
+            y: 197,
             width: 56,
             height: 56,
             type: 1
@@ -2527,7 +2527,7 @@
             XStation: 7,
             YStation: 5,
             x: 231,
-            y: 258,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2535,8 +2535,8 @@
           {
             XStation: 8,
             YStation: 5,
-            x: 290,
-            y: 258,
+            x: 294,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2544,8 +2544,8 @@
           {
             XStation: 9,
             YStation: 5,
-            x: 350,
-            y: 258,
+            x: 358,
+            y: 264,
             width: 56,
             height: 56,
             type: 1
@@ -2553,8 +2553,8 @@
           {
             XStation: 1,
             YStation: 6,
-            x: 232,
-            y: 30,
+            x: 230,
+            y: 20,
             width: 28,
             height: 28,
             type: 1
@@ -2562,8 +2562,8 @@
           {
             XStation: 2,
             YStation: 6,
-            x: 260,
-            y: 30,
+            x: 263,
+            y: 20,
             width: 28,
             height: 28,
             type: 1
@@ -2571,8 +2571,8 @@
           {
             XStation: 3,
             YStation: 6,
-            x: 290,
-            y: 35,
+            x: 296,
+            y: 25,
             width: 28,
             height: 28,
             type: 1
@@ -2580,8 +2580,8 @@
           {
             XStation: 4,
             YStation: 6,
-            x: 348,
-            y: 97,
+            x: 358,
+            y: 88,
             width: 28,
             height: 28,
             type: 1
@@ -2590,7 +2590,7 @@
             XStation: 5,
             YStation: 6,
             x: 230,
-            y: 65,
+            y: 58,
             width: 56,
             height: 56,
             type: 1
@@ -2598,8 +2598,8 @@
           {
             XStation: 6,
             YStation: 6,
-            x: 290,
-            y: 65,
+            x: 294,
+            y: 58,
             width: 56,
             height: 56,
             type: 1

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

@@ -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,7 +1353,7 @@
               _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'
@@ -1063,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]) {
@@ -1088,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: 135,
+                y: 35
+              })
             }
           }
         }

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

src/dashoo.cn/frontend_animal/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>
@@ -1647,8 +1647,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 +1691,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 +1737,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) {
           // 绘制颜色快