容器设置

src/dashoo.cn/frontend_web/nuxt.config.js

@@ -159,8 +159,8 @@ module.exports = {
   },
 
   axios: {
-    baseURL: '//localhost:9081/api/' // 本机开发使用
-    // baseURL: '//47.92.238.200:9081/api/' // BioBank on ALi发布使用
+    // baseURL: '//localhost:9081/api/' // 本机开发使用
+    baseURL: '//47.92.238.200:9081/api/' // BioBank on ALi发布使用
     // baseURL: '//188.188.30.89:9081/api/' //临沂使用
     // baseURL: '//api09.labsop.cn/api/'
     // baseURL: '//192.168.0.211:10091/api/' // 花生所系统

src/dashoo.cn/frontend_web/src/components/Headbar.vue

@@ -61,7 +61,7 @@
 
         fullscreen: false,
         sampcode: '',
-        department: '标准版'
+        department: '专业版'
       }
     },
     created() {

src/dashoo.cn/frontend_web/src/pages/biobank/sampleRK/_opera/operation.vue

@@ -505,7 +505,7 @@
           if (valid) {
             store.set('batchstorages', this.selectSamples)
             this.$router.push({
-              path: `/equipment/${this.equipmentForm.EquipmentId}/manage?batchitem=1&desc='样本入库'&apply=1`
+              path: `/equipment/${this.equipmentForm.EquipmentId}/manage_new?batchitem=1&desc='样本入库'&apply=1`
             })
           } else {
             return false

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

@@ -153,9 +153,7 @@
       </div>
       <!--冰箱-->
       <el-row>
-        <el-col :span="11" style="margin-top: 20px;">
-          <div class="slider" ref="slider">
-    <div class="slider-group" ref="sliderGroup" style="width:200px">
+        <el-col :span="11">
           <div class="tablebox">
             <table class="sampletablemanage"
               v-bind:style="{ width: yedanguanitem == 20 ? '80px' : 10*TableWidth + '%', height: yedanguanitem == 20 ? '70px' : 10*TableHeight + '%' }">
@@ -194,8 +192,6 @@
               </tbody>
             </table>
           </div>
-          </div>
-          </div>
         </el-col>
         <el-col :span="13">
           <el-card v-if="Apply_flag" class="box-card sampledetail" style="margin-top: 8px;" id="equiinfocard">
@@ -2235,7 +2231,7 @@
         batchitem: '0', // 批量添加类型，1：由交接单存储过来，带有样本类型，样本来源信息；2：有制备存储过来，不带样本类型等信息
         batchstorages: [], //批量存储的样本
         Apply_flag: true,
-        acc: ''
+        acc: '',
       }
     },
     created() {

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

@@ -71,10 +71,10 @@
                     <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" :key="ycolorTable"
-                        v-bind:class="{ 'tdborder': true, 'tdleftborder': k2 === 0, 'tdtopborder': k1 === 0, 'tdrightborder': k2 === colorTableWidth-1 }"
-                        @click="shelfclk(k2+1, k1+1)">
-                        <div class="ulbgcolor"
-                          v-bind:style="{ width: unitwidth/colorTableWidth + 'px', height: unitheight/colorTableHeight + 'px' }">
+                        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', 
+                                                      backgroundColor: xshelf === k2+1 && yshelf === k1+1 ? COLORARR[7] : COLORARR[8] }"
+                                                      @click="shelfclk(k2+1, k1+1)">                
                           <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" :key="rowindex">
@@ -322,7 +322,7 @@
         disableop2: false,
         boxSample: [],
         equipid: 0, // 新增，设备id
-        COLORARR: ['#EAEAEA', '#13CE66', '#FF4949', '#D1EEEE', '#20A0FF', '#836FFF', '#000080', '#FF7777'],
+        COLORARR: ['#EAEAEA', '#13CE66', '#FF4949', '#D1EEEE', '#20A0FF', '#836FFF', '#000080', '#FF7777', '#FFFFFF'],
         ishavedch: true,
         issampetypecheckedall: true, // 全选框
         copyVisible: false, // 复制

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

@@ -46,7 +46,7 @@
                 <p class="devplab">冻存盒数量：{{v.BoxCount}}</p>
               </el-col>
               <el-col :span="9">
-                <router-link :to="'/equipment/' + v.Equipment.Id + '/manage?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
+                <router-link :to="'/equipment/' + v.Equipment.Id + '/manage_new?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
                   <img v-if="v.Equipment.EAccCode == 'ALL'" :src="remoteurl + v.Equipment.Photo" style="height: 98px;">
                   <img v-else :src="'http://' + v.Equipment.Photo" style="height: 98px;">
                 </router-link>
@@ -60,10 +60,10 @@
             <el-button-group>
               <el-button type="primary" size="mini" @click="toeditdevice(v.Equipment.Id)">编辑</el-button>
               <el-button type="primary" size="mini" @click="deletedata(v.Equipment.Id, v.Equipment.Name)">删除</el-button>
-              <router-link :to="'/equipment/' + v.Equipment.Id + '/manage?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
+              <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?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
+              <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">
                 <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/login.vue

@@ -2,7 +2,7 @@
   <div class="nav">
     <header>
       <a href="/" class="nav-logo leftpadding" alt="egg">
-        <img src="../assets/img/logo.png" style="height:55px; margin-left: 200px">
+        <img src="../assets/img/logo.png" style="height:55px;">
       </a>
       <ul class="nav-item">
         <li><a href="http://www.dashoo.cn/product-3-1.html" alt="介绍">产品中心</a></li>
@@ -21,16 +21,16 @@
       <el-row>
         <el-col :span="15">
           <div class="leftpadding">
-            <img src="../assets/img/std.png" class="intelligent-img" /> </div>
+            <img src="../assets/img/major.png" class="intelligent-img" /> </div>
         </el-col>
         <el-col :span="9">
           <el-card class="box-card" style="width: 300px;margin-top: 130px;height: 360px;">
             <el-form class="login-form" auto-complete="off" :model="model" :rules="rules" ref="user">
               <h2 class="heading">登录</h2>
-              <el-form-item label="用户名" prop="username">
+              <el-form-item label="用户名" prop="username" style="margin-top:-5px">
                 <el-input type="text" v-model="model.username" placeholder="请输入用户名"></el-input>
               </el-form-item>
-              <el-form-item label="密码" prop="password">
+              <el-form-item label="密码" prop="password" style="margin-top:-20px">
                 <el-input type="password" v-model="model.password" placeholder="请输入密码" @keyup.enter.native="login()" />
               </el-form-item>
               <el-button type="primary" :loading="loading" @click="login()">{{ loading ? '登录中...' : '登录' }}</el-button>
@@ -40,8 +40,8 @@
       </el-row>
     </div>
 
-    <div class="footer">
-      <footer style="background: #F9F9F9;">
+    <div class="footer" style="height:calc(100vh - 500px);">
+      <footer>
         <el-row>
           <el-col :span="12">
             <div class="login_bg4">
@@ -125,7 +125,6 @@
             }
           }
         } catch (e) {
-          // this.$message.warning(e.message)
           this.$message.warning('账号或密码错误')
         } finally {
           this.logging = false
@@ -147,14 +146,14 @@
     border-bottom: 1px solid rgba(230, 230, 230, 0.99);
     z-index: 2;
     width: 100%;
-    min-height: 1100px;
+    // min-height: 1100px;
     position: fixed;
     top: 0;
   }
 
   .nav .nav-logo {
     padding-top: 2px;
-    padding-left: 35px;
+    padding-left: 210px;
   }
 
   .nav-logo {
@@ -162,7 +161,6 @@
     display: inline-block;
     float: left;
     padding-top: 2px;
-    background: #fff;
   }
 
   .nav header {
@@ -172,27 +170,16 @@
     margin: 0 auto;
   }
 
-  // .nav header .search-query {
-  //   height: 30px;
-  //   line-height: 32px;
-  //   box-sizing: border-box;
-  //   border: 1px solid #e6e6e6;
-  //   border-radius: 15px;
-  //   outline: none;
-  //   padding: 0 15px 0 32px;
-  //   background-size: 20px;
-  // }
-
   .nav ul.nav-item {
     height: 32px;
     float: left;
     line-height: 32px;
-    padding-left: 405px;
+    padding-left: 470px;
   }
 
   .nav ul.nav-item li {
     display: inline-block;
-    margin-left: 45px;
+    margin-left: 25px;
   }
 
   .nav ul.nav-item a {
@@ -206,7 +193,9 @@
     text-align: center;
     background: url("../assets/img/Background.png");
     width: 100%;
-    height: 150%;
+    // height: 150%;
+    min-height: 575px;
+    height: calc(100vh - 200px);
     margin: 0 auto;
     background-size: cover;
   }
@@ -217,7 +206,7 @@
   }
 
   .intelligent-img {
-    width: 600px;
+    width: 650px;
     margin-bottom: 2.5rem;
     margin-top: -30px;
   }
@@ -230,6 +219,7 @@
   .footer {
     min-width: 1100px;
     width: 100%;
+    
   }
 
   .footer a {
@@ -238,8 +228,8 @@
 
   .footer footer {
     overflow: hidden;
-    // max-width: 1136px;
-    max-width: 1550px;
+    min-width: 1136px;
+    // max-width: 1550px;
     margin: 0 auto;
     padding-top: 0px;
     padding-bottom: 30px;
@@ -251,7 +241,9 @@
   }
 
   .login_bg4 {
-    padding-left: 220px;
+    float: right;
+    // padding-left: 220px;
+    padding-right: 350px;
     padding-top: 15px;
   }
 
@@ -279,6 +271,11 @@
 
   .login {
     &-form {
+      .heading {
+        text-align: center;
+        color: #1c96ff;
+      }
+
       .el-button {
         margin-top: 0.5rem;
         width: 100%;

src/dashoo.cn/frontend_web/src/pages/login_major.vue → src/dashoo.cn/frontend_web/src/pages/login_std.vue

@@ -2,7 +2,7 @@
   <div class="nav">
     <header>
       <a href="/" class="nav-logo leftpadding" alt="egg">
-        <img src="../assets/img/logo.png" style="height:55px;">
+        <img src="../assets/img/logo.png" style="height:55px; margin-left: 200px">
       </a>
       <ul class="nav-item">
         <li><a href="http://www.dashoo.cn/product-3-1.html" alt="介绍">产品中心</a></li>
@@ -21,16 +21,16 @@
       <el-row>
         <el-col :span="15">
           <div class="leftpadding">
-            <img src="../assets/img/major.png" class="intelligent-img" /> </div>
+            <img src="../assets/img/std.png" class="intelligent-img" /> </div>
         </el-col>
         <el-col :span="9">
           <el-card class="box-card" style="width: 300px;margin-top: 130px;height: 360px;">
             <el-form class="login-form" auto-complete="off" :model="model" :rules="rules" ref="user">
               <h2 class="heading">登录</h2>
-              <el-form-item label="用户名" prop="username" style="margin-top:-5px">
+              <el-form-item label="用户名" prop="username">
                 <el-input type="text" v-model="model.username" placeholder="请输入用户名"></el-input>
               </el-form-item>
-              <el-form-item label="密码" prop="password" style="margin-top:-20px">
+              <el-form-item label="密码" prop="password">
                 <el-input type="password" v-model="model.password" placeholder="请输入密码" @keyup.enter.native="login()" />
               </el-form-item>
               <el-button type="primary" :loading="loading" @click="login()">{{ loading ? '登录中...' : '登录' }}</el-button>
@@ -40,8 +40,8 @@
       </el-row>
     </div>
 
-    <div class="footer" style="height:calc(100vh - 500px);">
-      <footer>
+    <div class="footer">
+      <footer style="background: #F9F9F9;">
         <el-row>
           <el-col :span="12">
             <div class="login_bg4">
@@ -125,6 +125,7 @@
             }
           }
         } catch (e) {
+          // this.$message.warning(e.message)
           this.$message.warning('账号或密码错误')
         } finally {
           this.logging = false
@@ -146,14 +147,14 @@
     border-bottom: 1px solid rgba(230, 230, 230, 0.99);
     z-index: 2;
     width: 100%;
-    // min-height: 1100px;
+    min-height: 1100px;
     position: fixed;
     top: 0;
   }
 
   .nav .nav-logo {
     padding-top: 2px;
-    padding-left: 210px;
+    padding-left: 35px;
   }
 
   .nav-logo {
@@ -161,6 +162,7 @@
     display: inline-block;
     float: left;
     padding-top: 2px;
+    background: #fff;
   }
 
   .nav header {
@@ -170,16 +172,27 @@
     margin: 0 auto;
   }
 
+  // .nav header .search-query {
+  //   height: 30px;
+  //   line-height: 32px;
+  //   box-sizing: border-box;
+  //   border: 1px solid #e6e6e6;
+  //   border-radius: 15px;
+  //   outline: none;
+  //   padding: 0 15px 0 32px;
+  //   background-size: 20px;
+  // }
+
   .nav ul.nav-item {
     height: 32px;
     float: left;
     line-height: 32px;
-    padding-left: 470px;
+    padding-left: 405px;
   }
 
   .nav ul.nav-item li {
     display: inline-block;
-    margin-left: 25px;
+    margin-left: 45px;
   }
 
   .nav ul.nav-item a {
@@ -193,9 +206,7 @@
     text-align: center;
     background: url("../assets/img/Background.png");
     width: 100%;
-    // height: 150%;
-    min-height: 575px;
-    height: calc(100vh - 200px);
+    height: 150%;
     margin: 0 auto;
     background-size: cover;
   }
@@ -206,7 +217,7 @@
   }
 
   .intelligent-img {
-    width: 650px;
+    width: 600px;
     margin-bottom: 2.5rem;
     margin-top: -30px;
   }
@@ -219,7 +230,6 @@
   .footer {
     min-width: 1100px;
     width: 100%;
-    
   }
 
   .footer a {
@@ -228,8 +238,8 @@
 
   .footer footer {
     overflow: hidden;
-    min-width: 1136px;
-    // max-width: 1550px;
+    // max-width: 1136px;
+    max-width: 1550px;
     margin: 0 auto;
     padding-top: 0px;
     padding-bottom: 30px;
@@ -241,9 +251,7 @@
   }
 
   .login_bg4 {
-    float: right;
-    // padding-left: 220px;
-    padding-right: 350px;
+    padding-left: 220px;
     padding-top: 15px;
   }
 
@@ -271,11 +279,6 @@
 
   .login {
     &-form {
-      .heading {
-        text-align: center;
-        color: #1c96ff;
-      }
-
       .el-button {
         margin-top: 0.5rem;
         width: 100%;

src/dashoo.cn/frontend_web/src/pages/samples/archived/index.vue

@@ -88,7 +88,7 @@
               {{jstimehandle(scope.row[item.filed])}}
             </template>
             <!-- <template v-else-if="item.filed === 'Location'">
-              <router-link :to="'/equipment/'+scope.row.EquipmentId +'/manage' + getstationurl(scope.row)">
+              <router-link :to="'/equipment/'+scope.row.EquipmentId +'/manage_new' + getstationurl(scope.row)">
                 {{scope.row.ECode}}-{{numtoupchar(scope.row.ShelfY)}}{{scope.row.ShelfX}}-{{numtoupchar(scope.row.BoxY)}}{{scope.row.BoxX}}-{{postiontoupchar(scope.row.Position)}}
               </router-link>
             </template> -->

src/dashoo.cn/frontend_web/src/pages/samples/stored/_opera/detailed.vue

@@ -195,7 +195,7 @@
             </el-col>
             <el-col :span="6">
               <router-link
-                :to="`/equipment/${sampleinfodetail.EquipmentId}/manage?station=${sampleinfodetail.ShelfX};${sampleinfodetail.ShelfY};${sampleinfodetail.BoxX};${sampleinfodetail.BoxY};${sampleinfodetail.Position};${sampleinfodetail.Id}`">
+                :to="`/equipment/${sampleinfodetail.EquipmentId}/manage_new?station=${sampleinfodetail.ShelfX};${sampleinfodetail.ShelfY};${sampleinfodetail.BoxX};${sampleinfodetail.BoxY};${sampleinfodetail.Position};${sampleinfodetail.Id}`">
                 <a>定位到位置:
                   <i class="icon icon-location"></i>
                 </a>

src/dashoo.cn/frontend_web/src/pages/samples/stored/index.vue

@@ -64,7 +64,7 @@
                 <i class="icon icon-eye"></i>
               </el-button>
             </router-link>
-            <router-link :to="'/equipment/'+scope.row.EquipmentId+'/manage'+getstationurl(scope.row)">
+            <router-link :to="'/equipment/'+scope.row.EquipmentId+'/manage_new'+getstationurl(scope.row)">
               <el-button type="text" size="small" title="样本存储信息" style="margin-left:3px;">
                 <i class="icon icon-location"></i>
               </el-button>
@@ -105,7 +105,7 @@
               {{jstimehandle(scope.row[item.filed])}}
             </template>
             <template v-else-if="item.filed === 'Location'">
-              <router-link :to="'/equipment/'+scope.row.EquipmentId +'/manage' + getstationurl(scope.row)">
+              <router-link :to="'/equipment/'+scope.row.EquipmentId +'/manage_new' + getstationurl(scope.row)">
                 {{scope.row.ECode}}-{{numtoupchar(scope.row.ShelfY)}}{{scope.row.ShelfX}}-{{numtoupchar(scope.row.BoxY)}}{{scope.row.BoxX}}-{{postiontoupchar(scope.row.Position)}}
               </router-link>
             </template>

src/dashoo.cn/frontend_web/src/pages/samples/waitingstore/index.vue

@@ -89,7 +89,7 @@
               {{jstimehandle(scope.row[item.filed])}}
             </template>
             <!-- <template v-else-if="item.filed === 'Location'">
-              <router-link :to="'/equipment/'+scope.row.EquipmentId +'/manage' + getstationurl(scope.row)">
+              <router-link :to="'/equipment/'+scope.row.EquipmentId +'/manage_new' + getstationurl(scope.row)">
                 {{scope.row.ECode}}-{{numtoupchar(scope.row.ShelfY)}}{{scope.row.ShelfX}}-{{numtoupchar(scope.row.BoxY)}}{{scope.row.BoxX}}-{{postiontoupchar(scope.row.Position)}}
               </router-link>
             </template> -->