zhongtianhaoyuan 3 лет назад
Родитель
Сommit
6c6eb91a5a
2 измененных файлов с 6 добавлено и 6 удалено
  1. 5 5
      src/views/houseSelfCollect/weightCheck.vue
  2. 1 1
      vue.config.js

+ 5 - 5
src/views/houseSelfCollect/weightCheck.vue

@@ -20,7 +20,8 @@
       
     <div class="left">
       <div class="top">
-        <div class="weight">{{carWeightInfo.weight}} <span>kg</span></div>
+        <div v-if="index==0" class="weight">{{weighingList.grossWeight}} <span>kg</span></div>
+        <div v-else class="weight">{{weighingList.tare}} <span>kg</span></div>
         <div class="car-no">{{carWeightInfo.carNumber}}</div>
          <div class="car-type">{{carWeightInfo.type}}</div>
       </div>
@@ -103,7 +104,7 @@
             </ws-form-item>
             <ws-form-item label="毛重(公斤)" span="1" prop="grossWeight">
               <ws-input
-                v-if="this.tpyeNo != 2"
+                v-if="this.index == 0"
                 v-model="weighingList.grossWeight"
                 @input="calculation"
                 placeholder="未获取到毛重"
@@ -123,7 +124,7 @@
             </ws-form-item>
             <el-button
               type="primary"
-              :class="tpyeNo != 2 ? '' : 'butCss'"
+              :class="index ==0 ? '' : 'butCss'"
               @click="openPort"
               >重新获取</el-button
             >
@@ -142,7 +143,7 @@
                 :disabled="disabled"
                 />
             </ws-form-item>
-            <el-button type="primary" v-if="information == '皮重'" @click="openPort">重新获取</el-button>
+            <el-button type="primary" v-if="index != 0" @click="openPort">重新获取</el-button>
             <div class="formItem">
               <ws-form-item
                 label="扣杂(公斤)"
@@ -192,7 +193,6 @@
     highlight-current-row
     @current-change="handleCurrentChange"
     style="width: 100%">
-    </el-table-column>
     <el-table-column
       property="number"
       label="编号"

+ 1 - 1
vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.120:8090/',
+        target: 'http://192.168.1.103:9100/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',