前端

src/api/common/index.js

@@ -101,4 +101,4 @@ export const API_POST_DELETEFILES = `/appendix/api/deleteFiles`
 export const API_POST_OTHERUPLOADFILES = `/appendix/api/uploadFiles`
 //获取公司下拉列表
 export const API_GET_API_COMPLIST = `/commonUser/getComp`
-export const API_GET_ADMINID = `/commonUser/api/onOpen`
+export const API_GET_ADMINID = `/commonUser/test`

src/layout/index/top/index.vue

@@ -19,9 +19,7 @@
     </div>
     <div class="top-bar__right">
       <!-- 使用租户 -->
-      <div >
-        <span style="padding: 0 4px;font-size:15px;">{{compName}}</span>
-      </div>
+      
       <div class="hidden-content">
         <el-input ref="hiddenFocus" type="password" class="input-Style" v-model="barCode" size="small" @focus="focus" @blur="blur"
           @keyup.enter.native="payCode" placeholder="扫码枪内容"></el-input>
@@ -48,6 +46,9 @@
           <el-button @click="smAlert = false" class="btn">关闭</el-button>
         </el-dialog>
       </div>
+      <div >
+        <span style="padding: 0 4px;font-size:15px;position:relative;top:-5px;">{{compName}}</span>
+      </div>
       <div v-if="getDay" class="right-menu-item hover-effect dayClass">
         {{ $t('common.trialDays') }}
         <span style="padding: 0 2px">{{ getDay }}</span>{{ $t('common.days') }}

src/views/home/index.vue

@@ -329,19 +329,19 @@
 
     },
     activated(){
-      var staffId=JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffId
-           if ('WebSocket' in window) {
-                  if (process.env.NODE_ENV === 'production') {
-                    this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/'+staffId )
-                  }
-                  else {
-                    //  this.websocket = new WebSocket('ws://192.168.1.115:8090/commonUser/api/onOpen?adminId=84f62127b7384dcdbaeaddfe460329fc' )
-                    this.websocket = new WebSocket('ws://192.168.1.115:8080/websocket/'+staffId )
-                  }
-                  this.initWebSocket()
-                } else {
-                  alert('当前浏览器不支持websocket')
-                }
+      // var staffId=JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffId
+      //      if ('WebSocket' in window) {
+      //             if (process.env.NODE_ENV === 'production') {
+      //               this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/'+staffId )
+      //             }
+      //             else {
+      //               //  this.websocket = new WebSocket('ws://192.168.1.115:8090/commonUser/api/onOpen?adminId=84f62127b7384dcdbaeaddfe460329fc' )
+      //               this.websocket = new WebSocket('ws://192.168.1.115:8080/websocket/'+staffId )
+      //             }
+      //             this.initWebSocket()
+      //           } else {
+      //             alert('当前浏览器不支持websocket')
+      //           }
     },
     async created() {
       //获取快捷路口列表
@@ -359,7 +359,7 @@
     },
     async mounted() {
       var staffId=JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffId
-      // getAdminId().toPromise().then(response => {
+      // getAdminId().toPromise().then(response => {console.log(11111)})
                 this.loading = false
                 // WebSocket
                 // this.$store.dispatch('setAdminId', response.data.data)
@@ -369,13 +369,13 @@
                   }
                   else {
                     //  this.websocket = new WebSocket('ws://192.168.1.115:8090/commonUser/api/onOpen?adminId=84f62127b7384dcdbaeaddfe460329fc' )
-                    this.websocket = new WebSocket('ws://192.168.1.115:8080/websocket/'+staffId )
+                    this.websocket = new WebSocket('ws://192.168.1.115:8090/websocket/'+staffId )
                   }
                   this.initWebSocket()
                 } else {
                   alert('当前浏览器不支持websocket')
                 }
-              // })
+              
       let that = this
       this.getChartsData()
       // this.timer = setInterval(function(){

src/views/warehouse/warehouseManagementList.vue

@@ -393,13 +393,13 @@
         }
       })
       if(typeof sums[4] =='number'){
-        sums[4]=sums[4].toFixed(2)
+        sums[4]=sums[4].toFixed(3)
       }
       if(typeof sums[5] =='number'){
-        sums[5]=sums[5].toFixed(2)
+        sums[5]=sums[5].toFixed(3)
       }
       if(typeof sums[6] =='number'){
-        sums[6]=sums[6].toFixed(2)
+        sums[6]=sums[6].toFixed(3)
       }
 			// sums[5]=sums[5].toFixed(2)
       // sums[6]=sums[6].toFixed(2)
@@ -500,7 +500,7 @@
           }
 
         } else if (this.headerText == '打印记录') {
-          console.log(this.parameter.startDate)
+          // console.log(this.parameter.startDate)
           addselectinfoList({
               compId: localStorage.getItem('ws-pf_compId'),
               startDate: this.parameter.startDate,
@@ -581,11 +581,11 @@
         }
       },
       startChane(e) {
-        console.log(e)
+        // console.log(e)
       },
       //清仓
       clearance(row) {
-        console.log(row.outNumber)
+        // console.log(row.outNumber)
         if (row.outNumber > 0) {
           this.$confirm(`你还有未完善的出库记录，请完善提交后再进行操作`, {
               cancelButtonText: '关闭',
@@ -822,7 +822,7 @@
       //任务
       handlTask() {
         var arr = []
-        console.log(this.list)
+        // console.log(this.list)
         for (let i = 0; i < this.list.length; i++) {
           arr.push(this.list[i].warehouseName)
         }
@@ -881,7 +881,7 @@
             for (let i = 0; i < response.length; i++) {
               if (response[i].warehouseNumViewList) {
                 for (let q = 0; q < response[i].warehouseNumViewList.length; q++) {
-                  console.log(response[i].warehouseNumViewList[q])
+                  // console.log(response[i].warehouseNumViewList[q])
                   if (response[i].warehouseNumViewList[q].inNetWeight) {
                     response[i].warehouseNumViewList[q].inNetWeight = Number(response[i].warehouseNumViewList[q]
                       .inNetWeight).toFixed(3)