update

src/utils/crypto.js

@@ -80,6 +80,5 @@ export function des_decrypt(str) {
     mode: CryptoJS.mode.CBC,
     padding: CryptoJS.pad.Pkcs7
   })
-  console.log(CryptoJS.pad.Pkcs7, 'des3')
   return decrypt_str.toString(CryptoJS.enc.Utf8)
 }

src/views/bridge/device-manage/device-work.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <div class="navbar" style="padding:0px;display:block">
+    <!-- <div class="navbar" style="padding:0px;display:block">
       <div class="nav-title" style="margin-left:10px">{{ title }}</div>
-    </div>
+    </div> -->
     <el-container class="content-height-fit">
       <inner-sidebar>
         <div id="project-section-tree">
@@ -46,6 +46,7 @@ import Pagination from '@/components/Pagination' // secondary package based on e
 import InnerSidebar from '@/components/InnerSidebar'
 import tkyIndex from '@/views/bridge/device-manage/tky-manage.vue'
 import * as Crypto from '@/utils/crypto'
+import _ from 'lodash'
 
 export default {
   name: 'DeviceMng',
@@ -84,7 +85,6 @@ export default {
   created() {
     if (this.$route.query.token) {
       this.tkySectionId = Crypto.des_decrypt(this.$route.query.token.replace(' ', '+'))
-      console.log('asdsadsd', this.tkySectionId)
     }
     try {
       this.$store.dispatch('user/clientCredentials')
@@ -128,9 +128,9 @@ export default {
         this.listQuery.deviceCode = data.deviceNo
         griderApi.lookByDevice(data.deviceNo)
           .then(res => {
-            this.griders = res
+            this.griders = _.orderBy(res, ['name'], ['desc'])
             if (this.griders.length > 0) {
-              this.listQuery.beamCode = res[0].name
+              this.listQuery.beamCode = this.griders[0].name
               this.getList()
             }
           })
@@ -226,4 +226,7 @@ export default {
 .el-selects >>> .el-input--suffix{
   width: 150px !important;
 }
+::v-deep .content-height-fit {
+    height: calc(100vh - 10px);
+}
 </style>

src/views/bridge/device-manage/tky-manage.vue

@@ -32,7 +32,7 @@
         </el-col> -->
       </el-row>
       <el-row>
-        <el-col :lg="24" :sm="24" :xs="24" :xl="24" :md="24" style="padding-right: 8px">
+        <el-col :lg="24" :sm="24" :xs="24" :xl="24" :md="24">
           <div class="boxall">
             <el-row>
               <el-col :lg="6" :sm="6" :xs="6" :xl="6" :md="6">

src/views/grider-erections/gride-work-info/components/new-2d.vue

@@ -513,16 +513,12 @@ export default {
           }
           self.car.offsetX = carCount * -1
           self.beam.offsetX = carCount * -1
-          // for (var f = 0; f < 3; f++) {
-          //   var ddd = lt.children[f]
-          //   var ss = 90 * Math.PI / 180
-          //   console.log('asdasd', ss)
-          //   ddd.rotate(ss)
-          // }
         } else {
           if (bhookLinesCount < 22) {
             if (bhookLinesCount % 22 === 0 && dataCount < 8) {
-              self.$emit('returndata', self.data[dataCount++])
+              if (self.data.length > dataCount) {
+                self.$emit('returndata', self.data[dataCount++])
+              }
             }
             bhookLinesCount++
             self.bhookXConfig.offsetY = bhookLinesCount * -1
@@ -534,7 +530,9 @@ export default {
           } else {
             if (bhooksCount < 200) {
               if (bhooksCount % 80 === 0 && dataCount < 10) {
-                self.$emit('returndata', self.data[dataCount++])
+                if (self.data.length > dataCount) {
+                  self.$emit('returndata', self.data[dataCount++])
+                }
               }
               bhooksCount++
               self.bhooksConfig.offsetX = bhooksCount * -1
@@ -542,7 +540,9 @@ export default {
             } else {
               if (fhookLinesCount < 22) {
                 if (fhookLinesCount % 22 === 0 && dataCount < 12) {
-                  self.$emit('returndata', self.data[dataCount++])
+                  if (self.data.length > dataCount) {
+                    self.$emit('returndata', self.data[dataCount++])
+                  }
                 }
                 fhookLinesCount++
                 self.fhookXConfig.offsetY = fhookLinesCount * -1
@@ -554,7 +554,9 @@ export default {
               } else {
                 if (hookCount < 204) {
                   if (hookCount % 50 === 0 && dataCount < 15) {
-                    self.$emit('returndata', self.data[dataCount++])
+                    if (self.data.length > dataCount) {
+                      self.$emit('returndata', self.data[dataCount++])
+                    }
                   }
                   hookCount++
                   self.fhooksConfig.offsetX += -1
@@ -564,7 +566,9 @@ export default {
                 } else {
                   if (returnhookCount < 70) {
                     if (hookCount % 70 === 0 && dataCount < 17) {
-                      self.$emit('returndata', self.data[dataCount++])
+                      if (self.data.length > dataCount) {
+                        self.$emit('returndata', self.data[dataCount++])
+                      }
                     }
                     returnhookCount++
                     self.bhookXConfig.offsetY += -1