From d750cbe0f896626be7c6e4409b081d40826994ee Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 29 Feb 2024 09:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=AF=B9?=
 =?UTF-8?q?=E4=BA=8E=E6=8C=89=E9=92=AE=E6=93=8D=E4=BD=9C=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                                  | 4 ++--
 .../energy/base/energyType/components/energyTypeAdd.vue   | 8 --------
 src/views/order/base/orderGroup/index.vue                 | 2 +-
 src/views/order/base/orderManage/index.vue                | 2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.env.dev b/.env.dev
index e6eafbc1..4df551ac 100644
--- a/.env.dev
+++ b/.env.dev
@@ -20,10 +20,10 @@ VUE_APP_TITLE = MES系统
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
-VUE_APP_BASE_API = 'http://192.168.1.47:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
 # socket地址
 VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
 VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
diff --git a/src/views/energy/base/energyType/components/energyTypeAdd.vue b/src/views/energy/base/energyType/components/energyTypeAdd.vue
index e9f085c0..1b808543 100644
--- a/src/views/energy/base/energyType/components/energyTypeAdd.vue
+++ b/src/views/energy/base/energyType/components/energyTypeAdd.vue
@@ -233,10 +233,6 @@ export default {
     // 增加
     emitButtonClick1() {
       let n = this.tableData1.length
-      if (n >=3) {
-        this.$modal.msgWarning('最多可添加3档计价')
-        return false
-      }
       let obj = {}
       obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime
       obj.endTime = ''
@@ -245,10 +241,6 @@ export default {
     },
     emitButtonClick2() {
       let n = this.tableData2.length
-      // if (n >=3) {
-      //   this.$modal.msgWarning('最多可添加3档计价')
-      //   return false
-      // }
       let obj = {}
       obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed
       obj.endUsed = 0
diff --git a/src/views/order/base/orderGroup/index.vue b/src/views/order/base/orderGroup/index.vue
index a531e16e..79316f63 100644
--- a/src/views/order/base/orderGroup/index.vue
+++ b/src/views/order/base/orderGroup/index.vue
@@ -283,7 +283,7 @@ export default {
                   {
                     type: 'less',
                     name: 'status',
-                    value: 3
+                    value: 2
                   }
                 ]
               }
diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue
index b3c722ed..ae99032f 100644
--- a/src/views/order/base/orderManage/index.vue
+++ b/src/views/order/base/orderManage/index.vue
@@ -293,7 +293,7 @@ export default {
                   {
                     type: 'less',
                     name: 'status',
-                    value: 3
+                    value: 2
                   }
                 ]
               }