ccj 3 jaren geleden
bovenliggende
commit
948616c1f0
4 gewijzigde bestanden met toevoegingen van 12 en 10 verwijderingen
  1. 2 2
      .env.production
  2. 1 1
      .env.test
  3. 7 6
      src/views/home/index.vue
  4. 2 1
      src/views/purchasingManagement/procurementPlanAdd.vue

+ 2 - 2
.env.production

@@ -4,8 +4,8 @@
 
 NODE_ENV = 'production'
 # base api
-#VUE_APP_BASE_API = 'http://api2.eliangeyun.com'
-VUE_APP_BASE_API = 'http://apitest.eliangeyun.com'
+VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
+#VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
 
 # 微服务相关接口配置
 ## 任务消息

+ 1 - 1
.env.test

@@ -4,7 +4,7 @@
 
 NODE_ENV = 'production'
 # base api
-VUE_APP_BASE_API = 'http://apitest.eliangeyun.com'
+VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
 
 # 微服务相关接口配置
 ## 任务消息

+ 7 - 6
src/views/home/index.vue

@@ -7,14 +7,13 @@
         <!-- 任务、消息、提醒、超期 -->
         <Panel :data-list="panelList"
                @click="gotoNewRw"></Panel>
-        <div v-show="true">
-          <el-button @click="test()">test</el-button>
-          <el-button @click="test1()">test1</el-button>
+        <div v-show="false">
+          <el-input v-model="param"/>
           <el-button @click="openPort()">openPort</el-button>
           <el-button @click="closePort()">closePort</el-button>
           <div>{{text}}</div>
         </div>
-       <!-- <img style='width:100%;margin-top:10px;' src="../../../public/img/tmt.gif" alt=""> -->
+       <img style='width:100%;margin-top:10px;' src="../../../public/img/tmt.gif" alt="">
       </div>
     </div>
     <div id="mapXY"></div>
@@ -120,7 +119,8 @@ export default {
       vesselBankFlag: sessionStorage.getItem('ws-pf_vesselBankFlag'),
       shezhiVal: '',
       text:"数据",
-      reader:null
+      reader:null,
+      param:9600
     }
   },
   computed: {
@@ -547,8 +547,9 @@ export default {
       if ('serial' in navigator) {
         // The Web Serial API is supported.
         console.log('the Web Serial API is supported.');
+        console.log(this.param);
         const port = await navigator.serial.requestPort();
-        await port.open({ baudRate: 9600 }); // set baud rate
+        await port.open({ baudRate: this.param }); // set baud rate
         this.reader = port.readable.getReader();
         // 监听来自串行设备的数据
         while (true) {

+ 2 - 1
src/views/purchasingManagement/procurementPlanAdd.vue

@@ -106,7 +106,7 @@
             >
               <ws-option
                 v-for="item in warehouseList"
-                :key="item.warehouseName"
+                :key="item.id"
               :label="item.warehouseName"
               :value="item.warehouseName"
               />
@@ -548,6 +548,7 @@ export default {
               this.warehouseList[i].warehouseCity
             ][this.warehouseList[i].warehouseArea].code
           this.selectedOptions = tmp
+          this.dataList.warehouseId = this.warehouseList[i].id
         }
       }
     },