diff --git a/.env.dev b/.env.dev
index 5e7d20c9..9e68c528 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,14 +12,14 @@ ENV = 'development'
VUE_APP_TITLE = MES系统
# 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
# VUE_APP_BASE_API = 'http://192.168.1.8:48080'
# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.56:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.56:48082'
# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
# 积木报表指向地址
diff --git a/public/favicon.ico b/public/favicon.ico
index e3bdd359..47918ab0 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/api/base/orderManage.js b/src/api/base/orderManage.js
index 38085d6a..9933c9b7 100644
--- a/src/api/base/orderManage.js
+++ b/src/api/base/orderManage.js
@@ -113,6 +113,15 @@ export function orderMonitor(query) {
})
}
+// 获取订单绑定的工单和数量信息,可传订单id列表,map索引为订单id
+export function orderAssignmentList(query) {
+ return request({
+ url: '/base/order/orderAssignmentList',
+ method: 'get',
+ params: query
+ })
+}
+
// 获得所有客户列表
export function customerList() {
return request({
diff --git a/src/assets/icons/svg/order-monitoring.svg b/src/assets/icons/svg/order-monitoring.svg
new file mode 100644
index 00000000..5960b5b3
--- /dev/null
+++ b/src/assets/icons/svg/order-monitoring.svg
@@ -0,0 +1,20 @@
+
+
\ No newline at end of file
diff --git a/src/views/delivery/deliveryLog/components/deliveryLogDetail.vue b/src/views/delivery/deliveryLog/components/deliveryLogDetail.vue
index 9f1b0827..1805f37c 100644
--- a/src/views/delivery/deliveryLog/components/deliveryLogDetail.vue
+++ b/src/views/delivery/deliveryLog/components/deliveryLogDetail.vue
@@ -69,7 +69,7 @@ const tableProps = [
prop: 'createTime',
label: '添加时间',
filter: parseTime,
- minWidth: 150
+ minWidth: 160
},
{
prop: 'deliveryCarCode',
@@ -81,7 +81,7 @@ const tableProps = [
prop: 'loadTime',
label: '装车时间',
filter: parseTime,
- minWidth: 150
+ minWidth: 160
},
{
prop: 'productName',
diff --git a/src/views/delivery/deliveryLog/index.vue b/src/views/delivery/deliveryLog/index.vue
index c1eea8d0..2beb27d9 100644
--- a/src/views/delivery/deliveryLog/index.vue
+++ b/src/views/delivery/deliveryLog/index.vue
@@ -78,7 +78,7 @@ const tableProps = [
prop: 'deliveryTime',
label: '发货时间',
filter: parseTime,
- minWidth: 150
+ minWidth: 160
},
{
prop: 'code',
diff --git a/src/views/delivery/deliveryLogDet/components/deliveryLogDetDetail.vue b/src/views/delivery/deliveryLogDet/components/deliveryLogDetDetail.vue
index 9d5ff8c4..158fafd7 100644
--- a/src/views/delivery/deliveryLogDet/components/deliveryLogDetDetail.vue
+++ b/src/views/delivery/deliveryLogDet/components/deliveryLogDetDetail.vue
@@ -122,7 +122,7 @@ const tableProps = [
prop: 'deliveryTime',
label: '发货时间',
filter: parseTime,
- minWidth: 150
+ minWidth: 160
},
{
prop: 'code',
@@ -151,7 +151,7 @@ const tableProps2 = [
prop: 'createTime',
label: '添加时间',
filter: parseTime,
- minWidth: 150
+ minWidth: 160
},
{
prop: 'deliveryCarCode',
@@ -162,7 +162,7 @@ const tableProps2 = [
prop: 'loadTime',
label: '装车时间',
filter: parseTime,
- minWidth: 150
+ minWidth: 160
},
{
prop: 'productName',
diff --git a/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue b/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
index 428b165e..1e14ce35 100644
--- a/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
+++ b/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
@@ -39,14 +39,12 @@
-
+
-
-
-
+
diff --git a/src/views/energy/base/energyPlcConnect/index.vue b/src/views/energy/base/energyPlcConnect/index.vue
index 7316665e..c5b679ef 100644
--- a/src/views/energy/base/energyPlcConnect/index.vue
+++ b/src/views/energy/base/energyPlcConnect/index.vue
@@ -37,6 +37,7 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
+ width='30%'
>
diff --git a/src/views/energy/base/energyType/components/InnerTable.vue b/src/views/energy/base/energyType/components/InnerTable.vue
index ff3adce7..13c1a91c 100644
--- a/src/views/energy/base/energyType/components/InnerTable.vue
+++ b/src/views/energy/base/energyType/components/InnerTable.vue
@@ -9,7 +9,7 @@
width="120">
- 单价(元): {{ singlePrice }}
+ 单价(元): {{ singlePrice.toFixed(2) }}
-
+
diff --git a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
index 53068272..667e1711 100644
--- a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
+++ b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
@@ -27,6 +27,18 @@
+
+
+
+
+
+
+
+
@@ -35,6 +47,14 @@
+
+
+
+
+
+
+
+
@@ -48,26 +68,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/src/views/order/monitoring/orderCompletionMonitoring/index.vue b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
index d1efb9f8..50d1bf40 100644
--- a/src/views/order/monitoring/orderCompletionMonitoring/index.vue
+++ b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
@@ -6,59 +6,45 @@
ref="searchBarForm"
@headBtnClick="buttonClick"
/>
-
-
+
+
+
+
+
+
+