Browse Source

容器界面 新样式

shihang 6 years ago
parent
commit
75948c0caf
1 changed files with 47 additions and 59 deletions
  1. 47 59
      src/dashoo.cn/frontend_web/src/pages/equipment/_opera/manage_new.vue

+ 47 - 59
src/dashoo.cn/frontend_web/src/pages/equipment/_opera/manage_new.vue

@@ -55,73 +55,61 @@
                 <i class="icon icon-stop2" style="color:#836FFF"></i>容量(50%-75%)
                 <i class="icon icon-stop2" style="color:#000080"></i>容量(75%-100%)
                 <el-row v-show="showtsyedanguan">
-                  <!-- <i class="icon icon-stop2" style="color:#EAEAEA"></i>无冻存盒
-                  <i class="icon icon-stop2" style="color:#13CE66"></i>空冻存盒
-                  <i class="icon icon-stop2" style="color:#FF4949"></i>选中
-                  <i class="icon icon-stop2" style="color:#D1EEEE"></i>容量(0-25%)
-                  <i class="icon icon-stop2" style="color:#20A0FF"></i>容量(25%-50%)
-                  <i class="icon icon-stop2" style="color:#836FFF"></i>容量(50%-75%)
-                  <i class="icon icon-stop2" style="color:#000080"></i>容量(75%-100%) -->
                   <el-row :gutter="20">
                     <el-col :span="18">
                       <canvas id="canvascryobiobank97K" width="450" height="450"></canvas>
                     </el-col>
                     <el-col :span="6">
-                      <div class="ulbgcolor" v-for="g in Math.ceil(selectdtedanguan.ColumnNum / 21)"
+                      <div class="ulbgcolor" v-for="g in Math.ceil(selectdtedanguan.ColumnNum / 21)" :key="g"
                         style="width:50px;float:left;margin-left:1px">
-                        <div v-for="b in selectdtedanguan.ColumnNum">
+                        <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] : 
-                        COLORARR[7])))))) }" style="margin: 1px;width:50px; height:20px;"></div>
+                              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>
                     </el-col>
                   </el-row>
                 </el-row>
                 <el-row v-show="showcgshebei">
-                  <!-- <i class="icon icon-stop2" style="color:#EAEAEA"></i>无冻存盒
-                  <i class="icon icon-stop2" style="color:#13CE66"></i>空冻存盒
-                  <i class="icon icon-stop2" style="color:#FF4949"></i>选中
-                  <i class="icon icon-stop2" style="color:#D1EEEE"></i>容量(0-25%)
-                  <i class="icon icon-stop2" style="color:#20A0FF"></i>容量(25%-50%)
-                  <i class="icon icon-stop2" style="color:#836FFF"></i>容量(50%-75%)
-                  <i class="icon icon-stop2" style="color:#000080"></i>容量(75%-100%) -->
                   <el-row :gutter="20">
                     <el-col :span="18">
                       <table cellspacing="0" cellpadding="0">
                         <thead>
                           <th></th>
-                          <th v-for="ind in colorTableWidth">{{ind}}</th>
+                          <th v-for="ind in colorTableWidth" :key="ind">{{ind}}</th>
                         </thead>
                         <tbody>
-                          <tr v-for=" (xcolorTable,k1) in colorTableHeight">
+                          <tr v-for=" (xcolorTable,k1) in colorTableHeight" :key="xcolorTable">
                             <td style="text-align:center;font-size:20px;">{{numtoengs[xcolorTable-1]}}</td>
-                            <td v-for="(ycolorTable,k2) in colorTableWidth"
+                            <td v-for="(ycolorTable,k2) in colorTableWidth" :key="ycolorTable"
                               v-bind:class="{ 'tdborder': true, 'tdleftborder': k2 === 0, 'tdtopborder': k1 === 0, 'tdrightborder': k2 === colorTableWidth-1 }">
                               <div class="ulbgcolor"
                                 v-bind:style="{ width: unitwidth/colorTableWidth + 'px', height: unitheight/colorTableHeight + 'px' }">
-                                <div v-for="(shelfitem, index) in samplelist">
+                                <div v-for="(shelfitem, index) in samplelist" :key="index">
                                   <div
                                     v-if="samplelist[index].XStation === k2+1 && samplelist[index].YStation === k1+1">
-                                    <div class="hoverdiv" v-for="rowindex in samplelist[index].RowNum">
+                                    <div class="hoverdiv" v-for="rowindex in samplelist[index].RowNum" :key="rowindex">
                                       <div
                                         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]}"
-                                        style="margin: 1px" @click="getEquipPosition(rowindex-1, k1+1, k2+1)"></div>
+                                          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]}"
+                                          style="margin: 1px" @click="getEquipPosition(rowindex-1, k1+1, k2+1)">
+                                      </div>
                                     </div>
                                   </div>
                                 </div>
@@ -134,23 +122,23 @@
                         <img :src="fridgebottomimg" class="fridge">
                       </div>
                     </el-col>
-                    <el-col :span="6">
-                      <div class="ulbgcolor" v-for="g in shelfs.ColumnNum"
-                        style="width:30px;float:left;margin-left:1px">
+                    <el-col :span="6" style="margin-top: 20px">
+                      <div class="ulbgcolor" v-for="g in shelfs.ColumnNum" :key="g" style="width:150px;float:left;margin-left:20px">
                         <div class="hoverdiv" v-bind:style="{ 
-                        backgroundColor: xbox == g && ybox == ybox && 
-                        xshelf == shelfs.YStation && yshelf == shelfs.XStation ? COLORARR[2] : 
-                        (shelfs['A'+g] == -2 ? COLORARR[0] : 
-                        (shelfs['A'+g] == -1 ? COLORARR[1] : 
-                        (shelfs['A'+g] > 0 && 
-                        shelfs['A'+g] <= 25 ? COLORARR[3] : 
-                        (shelfs['A'+g] > 25 && 
-                        shelfs['A'+g] <= 50 ? COLORARR[4] : 
-                        (shelfs['A'+g] > 50 && 
-                        shelfs['A'+g] <= 75 ? COLORARR[5] : 
-                        (shelfs['A'+g] > 75 ? COLORARR[6] : 
-                        COLORARR[7])))))) }" @click="handleclk(g-1, ybox-1, shelfs.YStation, shelfs.XStation)"
-                          style="margin: 1px;width:50px; height:20px;"></div>
+                          backgroundColor: xbox == g && ybox == ybox && 
+                          xshelf == shelfs.YStation && yshelf == shelfs.XStation ? COLORARR[2] : 
+                          (shelfs['A'+g] == -2 ? COLORARR[0] : 
+                          (shelfs['A'+g] == -1 ? COLORARR[1] : 
+                          (shelfs['A'+g] > 0 && 
+                          shelfs['A'+g] <= 25 ? COLORARR[3] : 
+                          (shelfs['A'+g] > 25 && 
+                          shelfs['A'+g] <= 50 ? COLORARR[4] : 
+                          (shelfs['A'+g] > 50 && 
+                          shelfs['A'+g] <= 75 ? COLORARR[5] : 
+                          (shelfs['A'+g] > 75 ? COLORARR[6] : 
+                          COLORARR[7])))))) }" @click="handleclk(g-1, ybox-1, shelfs.YStation, shelfs.XStation)"
+                          style="margin: 1px;width:50px; height:20px;">
+                        </div>
                       </div>
                     </el-col>
                   </el-row>
@@ -172,14 +160,14 @@
               v-bind:style="{ width: yedanguanitem == 20 ? '80px' : 10*TableWidth + '%', height: yedanguanitem == 20 ? '70px' : 10*TableHeight + '%' }">
               <thead>
                 <th></th>
-                <th v-for="ind in TableWidth">{{ind}}</th>
+                <th v-for="ind in TableWidth" :key="ind">{{ind}}</th>
               </thead>
               <tbody>
-                <tr class="index" v-for=" yindex in TableHeight">
+                <tr class="index" v-for=" yindex in TableHeight" :key="yindex">
                   <td style="width:3px;text-align:center;font-size:20px;">{{numtoengs[yindex-1]}}</td>
-                  <td v-for="xindex in TableWidth" class="visibletd">
+                  <td v-for="xindex in TableWidth" class="visibletd" :key="xindex">
                     <div v-if="IsPosition(boxSample,xindex+'',yindex+'')" v-for="(sdata, sindex) in boxSample"
-                      @click="tableclk(sdata, yindex,xindex)">
+                      :key="sindex" @click="tableclk(sdata, yindex,xindex)">
                       <span v-if="sdata.Position.split(';')[0]==xindex&&sdata.Position.split(';')[1]==yindex">
                         <div v-if="sdata.IState === 5">
                           <img :src="filehost + '/static/img/sampletypeimg/zhanwei.png'" class="image">
@@ -187,7 +175,7 @@
                         <div v-if="sdata.IState === 10">
                           <img :src=" '/img/lock.png'" class="image">
                         </div>
-                        <span v-else v-for="(type, tindex) in sampleTypeList">
+                        <span v-else v-for="(type, tindex) in sampleTypeList" :key="tindex">
                           <div v-if="sdata.SampleType == type.value">
                             <img :src="filehost + type.photo" class="image">
                           </div>
@@ -3781,7 +3769,7 @@
   }
 
   .fridge {
-    width: 576px;
+    width: 425px;
     height: 110px;
     margin-left: 13px;
   }