Browse Source

bug修改

wy 1 year ago
parent
commit
8b509ecb02
2 changed files with 10 additions and 5 deletions
  1. 6 3
      .env.development
  2. 4 2
      src/views/equipment-monitoring/index.vue

+ 6 - 3
.env.development

@@ -2,6 +2,9 @@
 ENV = 'development'
 ENV = 'development'
 
 
 # base api
 # base api
-VUE_APP_BASE_API = 'http://192.168.3.177:8080/api'
-VUE_APP_WS = 'ws://192.168.3.177:8080/ws'
-VUE_APP_VIDEO = 'ws://192.168.3.177:8082/ws'
+# VUE_APP_BASE_API = 'http://192.168.3.177:8080/api'
+# VUE_APP_WS = 'ws://192.168.3.177:8080/ws'
+# VUE_APP_VIDEO = 'ws://192.168.3.177:8082/ws'
+VUE_APP_BASE_API = 'http://192.168.0.72:8080/api'
+VUE_APP_WS = 'ws://192.168.0.72:8080/ws'
+VUE_APP_VIDEO = 'ws://192.168.0.72:8082/ws'

+ 4 - 2
src/views/equipment-monitoring/index.vue

@@ -311,14 +311,14 @@
                 />
                 />
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
-            <el-form-item label="充电功率:" label-width="120px">
+            <el-form-item label="充电功率:" label-width="120px" v-if="setType != 0">
               <el-input
               <el-input
                 v-model="fromData.powerNum"
                 v-model="fromData.powerNum"
                 placeholder="请输入充电功率"
                 placeholder="请输入充电功率"
                 maxlength="4"
                 maxlength="4"
                 @input="handleEdit"
                 @input="handleEdit"
               ></el-input>
               ></el-input>
-              <span class="kwh">kWh</span>
+              <span class="kwh">{{ setType == 2 ?'%':'kWh' }}</span>
             </el-form-item>
             </el-form-item>
           </el-form>
           </el-form>
         </div>
         </div>
@@ -429,8 +429,10 @@ export default {
       console.log(data, "data");
       console.log(data, "data");
       if (data.comState == 0) {
       if (data.comState == 0) {
         this.fromData.comState = "插枪充电";
         this.fromData.comState = "插枪充电";
+        this.fromData.arr = [ {text: "A枪",value: "0",},{text: "B枪",value: "1",}]
       } else {
       } else {
         this.fromData.comState = "线束充电";
         this.fromData.comState = "线束充电";
+        this.fromData.arr = [ {text: "A枪",value: "0",},]
       }
       }
       this.fromData.cangnum = data.cangnum;
       this.fromData.cangnum = data.cangnum;
       this.dialogChargeVisible = true;
       this.dialogChargeVisible = true;