Browse Source

订单日志

蒋科 2 months ago
parent
commit
5fac46a656

+ 3 - 3
src/utils/request.js

@@ -2,11 +2,11 @@ import axios from 'axios'
 import { Message } from 'element-ui'
 import { Message } from 'element-ui'
 import store from '@/store'
 import store from '@/store'
 import { tansParams } from '@/utils/zk'
 import { tansParams } from '@/utils/zk'
-// const href='http://'+window.location.hostname+'/api'
+const href='http://'+window.location.hostname+'/api'
 const service = axios.create({
 const service = axios.create({
   // baseURL: httpurl.devServer.proxy['/api'].target+'/api',
   // baseURL: httpurl.devServer.proxy['/api'].target+'/api',
-  baseURL:process.env.VUE_APP_BASE_API,
-  // baseURL:href,
+  // baseURL:process.env.VUE_APP_BASE_API,
+  baseURL:href,
   timeout: 5000
   timeout: 5000
 })
 })
 // request interceptor
 // request interceptor

+ 6 - 3
src/views/manage-log/battery-charger.vue

@@ -316,7 +316,10 @@ export default {
           );
           );
         }
         }
         if (this.robotValue.length > 0) {
         if (this.robotValue.length > 0) {
-          this.queryParams.signals = this.robotValue;
+          this.queryParams.signals = [...this.robotValue];
+          if(this.queryParams.signals[0]=='全选'){
+            this.queryParams.signals.shift()
+          }
           let differenceABSet = Array.from(
           let differenceABSet = Array.from(
             new Set(
             new Set(
               [...this.logOptions].filter((x) =>
               [...this.logOptions].filter((x) =>
@@ -396,12 +399,12 @@ export default {
         width: 5px !important;
         width: 5px !important;
     }
     }
 }
 }
- 
+
 
 
 ::v-deep .el-table__header colgroup col[name="gutter"] {
 ::v-deep .el-table__header colgroup col[name="gutter"] {
     display: table-cell !important;
     display: table-cell !important;
 }
 }
- 
+
 ::v-deep .el-table__body{
 ::v-deep .el-table__body{
   width: 100% !important;
   width: 100% !important;
 }
 }

+ 4 - 1
src/views/manage-log/order-charger.vue

@@ -316,7 +316,10 @@ export default {
           );
           );
         }
         }
         if (this.robotValue.length > 0) {
         if (this.robotValue.length > 0) {
-          this.queryParams.signals = this.robotValue;
+          this.queryParams.signals = [...this.robotValue];
+          if(this.queryParams.signals[0]=='全选'){
+            this.queryParams.signals.shift()
+          }
           let differenceABSet = Array.from(
           let differenceABSet = Array.from(
             new Set(
             new Set(
               [...this.logOptions].filter((x) =>
               [...this.logOptions].filter((x) =>