Browse Source

容器定位bug更新

shihang 6 years ago
parent
commit
3bbcf04968

+ 2 - 2
src/dashoo.cn/frontend_animal/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/' // 花生所系统

+ 1 - 1
src/dashoo.cn/frontend_animal/src/pages/equipment/_opera/manage_new.vue

@@ -2514,7 +2514,7 @@
       },
       // 获取冰箱冻存架点击坐标
       getEquipPosition(ybox, xshelf, yshelf) {
-        let index = (xshelf - 1) * this.colorTableWidth + yshelf - 1
+        let index = (xshelf - yshelf) + (yshelf - 1) * (this.colorTableHeight + 1)
         this.shelfs = this.samplelist[index]
         this.xshelf = xshelf
         this.yshelf = yshelf

+ 1 - 1
src/dashoo.cn/frontend_animal/src/pages/equipment/_opera/shelfset_new.vue

@@ -437,7 +437,7 @@
       },
       // 获取冰箱冻存架点击坐标
       getEquipPosition(ycolor, xidx, yidx) {
-        let index = (xidx - 1) * this.colorTableWidth + yidx - 1
+        let index = (xidx - yidx) + (yidx - 1) * (this.colorTableHeight + 1)
         this.shelfs = this.samplelist[index]
         this.xidx = xidx
         this.yidx = yidx

+ 1 - 1
src/dashoo.cn/frontend_web/src/layouts/default.vue

@@ -5,7 +5,7 @@
 	<section class="main">
       <sidebar></sidebar>
       <main class="content">
-        <nuxt class="inner"></nuxt>
+        <nuxt class="inner" style="height: calc(100vh - 90px);"></nuxt>
       </main>
     </section>
     <div>

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

@@ -2514,7 +2514,7 @@
       },
       // 获取冰箱冻存架点击坐标
       getEquipPosition(ybox, xshelf, yshelf) {
-        let index = (xshelf - 1) * this.colorTableWidth + yshelf - 1
+        let index = (xshelf - yshelf) + (yshelf - 1) * (this.colorTableHeight + 1)
         this.shelfs = this.samplelist[index]
         this.xshelf = xshelf
         this.yshelf = yshelf

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/equipment/_opera/shelfset_new.vue

@@ -437,7 +437,7 @@
       },
       // 获取冰箱冻存架点击坐标
       getEquipPosition(ycolor, xidx, yidx) {
-        let index = (xidx - 1) * this.colorTableWidth + yidx - 1
+        let index = (xidx - yidx) + (yidx - 1) * (this.colorTableHeight + 1)
         this.shelfs = this.samplelist[index]
         this.xidx = xidx
         this.yidx = yidx