Explorar o código

无意义提交

zhouzhendong %!s(int64=3) %!d(string=hai) anos
pai
achega
c9aba41f82

+ 2 - 2
resources/views/equipment/_detailInfo.blade.php

@@ -16,9 +16,9 @@
             </div>
             <div class="modal-body row">
                 <div class="col-6" style="border-right: 1px #D3D3D3 solid">
-                    <div v-for="(item,i) in flipChildren" style="border: 1px #000000 solid;height: 70px;cursor: pointer" @click="nextDetail(i+1)"
+                    <div v-for="(item,i) in flipChildren" style="border: 1px #000000 solid;height: 70px;cursor: pointer" @click="nextDetail(item.idx)"
                         :style="[{width:100*(current.grid)+'px'}]">
-                        <span class="h-100 w-100 el-center">@{{ item.code ? item.code : i+1 }}</span>
+                        <span class="h-100 w-100 el-center">@{{ !!item.code ? item.code : item.idx }}</span>
                     </div>
                 </div>
                 <div class="col-6 p-0" :style="[error.children ? {border: '2px red solid'} : '']">

+ 5 - 3
resources/views/equipment/index.blade.php

@@ -377,7 +377,9 @@
                 }
                 let children = [];
                 for (let i=this.current.children.length - 1;i>=0;i--){
-                    children.push(this.current.children[i]);
+                    let obj = this.current.children[i];
+                    obj.idx = i+1
+                    children.push(obj);
                 }
                 return children;
             },
@@ -502,7 +504,7 @@
                         error : (err,status)=>{
                             window.tempTip.show("坐标信息加载失败");
                         },
-                        timeout:8000,
+                        timeout:30000,
                     })
                 },200);
             },
@@ -1014,7 +1016,6 @@
             },
             //子设备选定时的库位加载
             nextDetail(index){
-                let children = this.current.children[index-1];
                 if (!this.current.eqId) {
                     window.tempTip.index = 1050;
                     window.tempTip.inputVal("子设备编码", (val)=> {
@@ -1024,6 +1025,7 @@
                 }
                 this.batchSign = false;
                 this.currentEqChildIndex = index-1;
+                let children = this.current.children[index-1];
                 this.isLoadLocation = true;
                 this._locationAttrDefault();
                 setTimeout(function (){