蜜蜂所RCB600液氮罐结构图修改

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

@@ -1000,31 +1000,15 @@ func (this *EquipmentController) AddEquipment() {
 					shelf_y_int = 8
 					box_x_int = 9
 					box_y_int = 9
-				} else if i >= 9 && i <= 13 { // 9-13号10层10*10孔
-					shelf_x_int = 1
-					shelf_y_int = 10
-					box_x_int = 10
-					box_y_int = 10
-					if j > 5 {
-						continue
-					}
-				} else if i >= 14 && i <= 16 { // 14-16号14层10*10孔
-					shelf_x_int = 1
-					shelf_y_int = 14
-					box_x_int = 10
-					box_y_int = 10
-					if j > 3 {
-						continue
-					}
-				} else if i >= 17 && i <= 20 { // 17-20号14层10*10孔
+				} else if i >= 9 && i <= 20 { // 9-20号14层10*10孔
 					shelf_x_int = 1
 					shelf_y_int = 14
 					box_x_int = 10
 					box_y_int = 10
-					if j > 4 {
+					if j > 12 {
 						continue
 					}
-				} else if i == 21 || i == 22 { // 21-22号14层5*5孔
+				}  else if i == 21 || i == 22 { // 21-22号14层5*5孔
 					shelf_x_int = 1
 					shelf_y_int = 14
 					box_x_int = 5

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

@@ -351,7 +351,7 @@
             <el-form-item label="样本类型" required prop="SampleTypestr">
               <el-select v-model="sampleForm.SampleTypestr" clearable placeholder="请选择" style="width:100%"
                 @change="chooseSampleType" :disabled="disabledsampletype || batchitem == '1'">
-                <el-option v-for="item in sampleTypeList" :label="item.label" :key="item" :value="item.value">
+                <el-option v-for="item in sampleTypeList" :label="item.label" :key="item.value" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -463,7 +463,7 @@
               <el-input v-model="sampleForm.uploadedremark" type="textarea" :rows="2" placeholder="附件说明">
               </el-input>
               <el-row>
-                <el-col :span="6" v-for="item in achmentlist" :key="item">
+                <el-col :span="6" v-for="item in achmentlist" :key="item.FileId">
                   <a @click="clickachment(item.Host, item.FileId)">{{item.FileName}}</a>
                 </el-col>
               </el-row>
@@ -3180,7 +3180,6 @@
       },
       // 获取液氮罐点击canvas的坐标
       getEventPosition (ev) {
-        console.log('???????????', ev)
         let x, y
         if (ev.layerX || ev.layerX === 0) {
           x = ev.layerX
@@ -3286,11 +3285,14 @@
             _this.boxSample = res.data.Boxsample
             _this.TableHeight = _this.selectedBox.RowNum
             _this.TableWidth = _this.selectedBox.ColumnNum
-            for (var i = 0; i < this.boxSample.length; i++) {
-              if (this.boxSample[i].Position == this.ytable + ';' + this.xtable) {
-                this.tableclk(this.boxSample[i], this.xtable, this.ytable)
+            if (this.boxSample !== null) {
+              for (var i = 0; i < this.boxSample.length; i++) {
+                if (this.boxSample[i].Position == this.ytable + ';' + this.xtable) {
+                  this.tableclk(this.boxSample[i], this.xtable, this.ytable)
+                }
               }
             }
+  
             // 重置选择的冻存管
             _this.dchxtable = -1
             _this.dchytable = -1
@@ -4236,7 +4238,6 @@
         this.imagefiles = ''
       },
       handleRemove (file, fileList) {
-        console.log(this.imagefilelist)
         for (var i = 0; i < this.imagefilelist.length; i++) {
           if (this.imagefilelist[i].uid != file.uid) {
             this.imagenewlist = this.imagenewlist + this.imagefilelist[i].url.substring(7, 42) + `|`
@@ -4340,7 +4341,7 @@
       .visibletd {
         border: 2px solid #A2B5CD;
         width: 20px;
-        height: 20px;
+        height: 40px;
         text-align: center;
         background: url(/assets/img/yuan.png);
         background-size: 100% 100%;
@@ -4348,7 +4349,7 @@
     }
 
     width: 530px;
-    height: 440px;
+    min-height: 440px;
     /*position: relative;*/
     /*display: inline-block;*/
     /*float: left;*/