From dfc758bfaef2c2a71e0d59eed9175181e0026815 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Wed, 22 Nov 2023 16:58:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=91=E6=8E=A7=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 6 +- public/favicon.ico | Bin 2013 -> 4286 bytes src/api/base/orderManage.js | 9 + src/assets/icons/svg/order-monitoring.svg | 20 ++ .../components/deliveryLogDetail.vue | 4 +- src/views/delivery/deliveryLog/index.vue | 2 +- .../components/deliveryLogDetDetail.vue | 6 +- .../components/energyPlcParamAdd.vue | 6 +- .../energy/base/energyPlcConnect/index.vue | 1 + .../base/energyType/components/InnerTable.vue | 20 +- .../energyType/components/energyTypeAdd.vue | 2 +- .../energyLimit/components/energyLimitAdd.vue | 48 +-- .../energy/monitoring/energyLimit/index.vue | 2 +- .../energy/monitoring/energyReport/index.vue | 4 +- .../monitoring/energyReportSearch/index.vue | 5 +- .../energy/monitoring/orderEnergy/index.vue | 4 +- src/views/group/base/groupTeam/index.vue | 2 +- .../components/groupTeamViewDetail.vue | 46 ++- .../group/monitoring/groupTeamView/index.vue | 3 +- .../group/monitoring/teamProduction/index.vue | 12 +- src/views/order/base/orderManage/index.vue | 7 +- .../base/orderManage/orderDetailData.vue | 19 +- .../components/monitoringRingCharts.vue | 168 ++++++++++ .../orderCompletionMonitoring/index.vue | 301 +++++++----------- 24 files changed, 422 insertions(+), 275 deletions(-) create mode 100644 src/assets/icons/svg/order-monitoring.svg create mode 100644 src/views/order/monitoring/components/monitoringRingCharts.vue 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 e3bdd359d3d432444a0a3c56dddebdc33f22b890..47918ab0fa954f932e6aeedef6a18baa5933e5b6 100644 GIT binary patch literal 4286 zcmcInO-~d-5Uq)E5q1q8j7QmnCPWYZ029%Z9E3nZBoPx1aDaoq0e+5WFB(tW_>My2 ziNnJ7Oz#5n6%a8J$M>Ew^PwOGZ2Ne&hMEYZdJJ2hxHdoPRF6f}gl*A(tVaT= z0K3`&w&6kD3OMKye_TrLyoAq(SHreB=tJ7{e8I-Czh314`(n7BLwOwWNy#Cr5~^nSvDeYkHDRCwybN^;_W0u(N$RMT7Wni(1Am|KUlb|b zFjoD0>V%7d?5C_P{Uml8eo{NJ$D$#B%tpy*2)UI}AJXud8~PMAGo@BE;$*$=pr+|l zcaFR8SxUUcCnXZIP_?uuu(!Dg@CAO_$4@R=8kf8_!-YR0zG z*||jY{lWh4xc*@O^E|LI z?Qtvo|6hOLn@9bPJE%X@X<2`N7V=s54O9R1ZINmo=So3j1AW@VIm%F$I$8L%T`oO* zbo2~)vf-|i$=S&q+(i3KIg!db?7nVhz;B$ROd`99bw}>G&flaa!{*L|njLiyeAnE$ zLVea^)0j^ca8lF%IH+lUtLYm#_AYGZv|fWgFzrY8fj9Cs>%1_zn_!&dY?xvLxAPi5 zGoRKc=Na}Bv0P7992#w!`$N|K#nwsuUTyZfkw>KnpVs~2!1%giY~ymwm_~@XzT1fA zepmOwVbzaABUb%8?u1zHh=gb!7ayK*&wv;pFEC+^F6!|n7g8>+37uH3weD!FrZufzlDPx+mq|oHR9Hvtn0ruE*B!^d=ia?{<)sjt0tz>~j5+7rdai%E^mO2j2)EI{r(2;3$B7z{q7zqd{LV0ZE6<7#xm%aCN z&az7uvb!wMbf(juzjp3D=lnkB`+J<nOnWfj0I@)10pz#; zE(lu~88kZp&`nom3J8Pf0(1oAu&WT(4eaV|#|J#1D4;n@fGk^OCPC%`!2#ev^O!va zWVfpU&D=yMV02cPNs!J7B{E%A!UFNf4nWI5mIA+5Kz7X%CR<~1lNm%0WKs~FBM4^H z)`#pj1uf_Vc1Ho@Y>yg1&;WS^B+b@M?6)I0i!xan=BDnT!1LoRtuIm#yBWkF6wnhC zxW!w1t^kq-C?XaJYba1a=me5EK+T@X69-tuf$Vbz!?KBV01`k%M} zrnLhv3LqbuoG%_H?I2^sasqpE{}Uh-kp8HG$3 zD~?i-{r2L-rCesjf4EFbkG~mJ|S#&P9}VAW;A*nOFMS zfPAYZem08y4}o+6Hz`PzqqJaGKLvf&1XNgKLSZZRP$pf`*_q7~vBAnZXq@Q7*xW{s;b zt^in#aiCQuATa>ww_RuV6yFAnMG3nQb``NwG8i7XNI_!etBfT@t7TxrbS13zocfi) z2p|__V9qcTfr;vIP=^ps6|q%@1NoQ&5w6CY^3Wah$-orOvNk11` zR`xWJqy@5v2RGJq-_vuTFU7QQVXd-gQDd)0Q}UQjHzw(hgrWM{WnRJzPHYj~f{dA3OW!AoV*Z3rOYl4M^U~qq!NT>I!g=2ZMXqh4J;9UZ7tM z`>5|XXiZHGaYD@6Paq0oTyM8zGz_dnf4_!LNIXVHBfJ}qL8P8u?KC)4RNcAdKYIF4LF&BUC6oGw z({k!|g6ri#WjPQW3etQRcrGbJespm$*Y;pPf9>iHr0#rI88mb$D*j2Xsxpn2O?~qE z7hWb~3?w1(D2a%;!e#6)S2q20KURIeT=jZZrD02|8ARyo`2~VQiqU%iDfu6*8bzZi z;vdxv@^zo>Ql0xKNILe`r*choAfjUc!_Xv%%GYY-?{y)xHMou z*|{r@oq_#reKb0m-mEQZq6MUBLmNIViLsSe%V?AhX4GF*5Q)QIhJ6qWB}>V(~s@#2+6mRbk`k+PRM6rhogkt&kTHT8N7C-Xp;W(k_ zFCUvS4uz4P9>LVswnn^EdljpEhvHB-~~gTiyhCs*fq9?34Vrl~=vTS42qqCibk ziXZDkRbF00UT?o$Jd&5^>!H=^*_yBN^OvYPJAF)mJNx^ME?n5*xp(hFdhD3TNM~Du v`xD_MM5`UACr^4ydVREdg + + 编组 17 + + + + + + + + + + + + + + + + + \ 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 @@ -26,28 +26,6 @@ - - - - - - - - - - - - - - - - - - @@ -61,10 +39,32 @@ + + + + + + + + + + - - + + + + + + + + + + diff --git a/src/views/energy/monitoring/energyLimit/index.vue b/src/views/energy/monitoring/energyLimit/index.vue index ce058a31..1b82ab8b 100644 --- a/src/views/energy/monitoring/energyLimit/index.vue +++ b/src/views/energy/monitoring/energyLimit/index.vue @@ -37,7 +37,7 @@ @cancel="handleCancel" @confirm="handleConfirm" :before-close="handleCancel" - width='60%' + width='50%' > diff --git a/src/views/energy/monitoring/energyReport/index.vue b/src/views/energy/monitoring/energyReport/index.vue index 6e2e4c6f..48456b85 100644 --- a/src/views/energy/monitoring/energyReport/index.vue +++ b/src/views/energy/monitoring/energyReport/index.vue @@ -40,13 +40,13 @@ const tableProps = [ prop: 'startTime', label: '开始时间', filter: parseTime, - minWidth: 150 + minWidth: 160 }, { prop: 'endTime', label: '结束时间', filter: parseTime, - minWidth: 150 + minWidth: 160 }, { prop: 'statisticName', diff --git a/src/views/energy/monitoring/energyReportSearch/index.vue b/src/views/energy/monitoring/energyReportSearch/index.vue index 117b6d12..d10f444a 100644 --- a/src/views/energy/monitoring/energyReportSearch/index.vue +++ b/src/views/energy/monitoring/energyReportSearch/index.vue @@ -70,7 +70,7 @@ export default { }, { type: 'datePicker', - label: '时间(必填)', + label: '时间', dateType: 'datetimerange', format: 'yyyy-MM-dd HH:mm:ss', valueFormat: "timestamp", @@ -80,7 +80,8 @@ export default { param: 'timeVal', defaultSelect: [], width: 350, - clearable: false + clearable: false, + required:true }, { type: 'button', diff --git a/src/views/energy/monitoring/orderEnergy/index.vue b/src/views/energy/monitoring/orderEnergy/index.vue index b66497bf..96e8e5d2 100644 --- a/src/views/energy/monitoring/orderEnergy/index.vue +++ b/src/views/energy/monitoring/orderEnergy/index.vue @@ -172,11 +172,11 @@ export default { this.$modal.msgWarning('工单不能为空') return false } - if (!val.objType) { + if (!val.energyTypeId) { this.$modal.msgWarning('能源类型不能为空') return false } - if (!val.energyTypeId) { + if (!val.objType) { this.$modal.msgWarning('对象维度不能为空') return false } diff --git a/src/views/group/base/groupTeam/index.vue b/src/views/group/base/groupTeam/index.vue index 14d3ce47..50d31d11 100644 --- a/src/views/group/base/groupTeam/index.vue +++ b/src/views/group/base/groupTeam/index.vue @@ -58,7 +58,7 @@ const tableProps = [ prop: 'createTime', label: '创建时间', filter: parseTime, - minWidth: 150 + minWidth: 160 }, { prop: 'name', diff --git a/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue b/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue index bdf1eba9..58c17c34 100644 --- a/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue +++ b/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue @@ -2,14 +2,16 @@
- - - - - - - - + + +

工单名称

+

{{ queryParams.workOrderName ? queryParams.workOrderName : '-' }}

+ + +

班组名称

+

{{ queryParams.teamName ? queryParams.teamName : '-' }}

+ + { - this.tableH = this.tableHeight(200) + this.tableH = this.tableHeight(260) }) }, methods: { @@ -79,5 +79,23 @@ export default { \ No newline at end of file diff --git a/src/views/group/monitoring/groupTeamView/index.vue b/src/views/group/monitoring/groupTeamView/index.vue index 821a60b3..6a172aed 100644 --- a/src/views/group/monitoring/groupTeamView/index.vue +++ b/src/views/group/monitoring/groupTeamView/index.vue @@ -59,7 +59,8 @@ export default { label: '工单', selectOptions: [], param: 'workOrderId', - clearable: false + clearable: false, + filterable: true }, { type: 'button', diff --git a/src/views/group/monitoring/teamProduction/index.vue b/src/views/group/monitoring/teamProduction/index.vue index 611dd390..2fc7f884 100644 --- a/src/views/group/monitoring/teamProduction/index.vue +++ b/src/views/group/monitoring/teamProduction/index.vue @@ -17,7 +17,7 @@ v), diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue index 746dbf2c..91878fca 100644 --- a/src/views/order/base/orderManage/index.vue +++ b/src/views/order/base/orderManage/index.vue @@ -65,7 +65,7 @@ const tableProps = [ prop: 'createTime', label: '添加时间', filter: parseTime, - minWidth: 150 + minWidth: 160 }, { prop: 'name', @@ -101,12 +101,12 @@ const tableProps = [ { prop: 'planQuantity', label: '计划加工量', - width: 90 + width: 100 }, { prop: 'actualQuantity', label: '实际加工量', - width: 90 + width: 100 }, { prop: 'productName', @@ -341,6 +341,7 @@ export default { item.customerId = i.name } } + item.price = item.price.toFixed(2) }) this.list = arr } diff --git a/src/views/order/base/orderManage/orderDetailData.vue b/src/views/order/base/orderManage/orderDetailData.vue index 5dd79f87..82f64cf7 100644 --- a/src/views/order/base/orderManage/orderDetailData.vue +++ b/src/views/order/base/orderManage/orderDetailData.vue @@ -5,6 +5,7 @@ 订单编码: {{orderMsg.code}}
+ 返回
@@ -133,7 +134,7 @@ const tableProps1 = [ prop: 'issueTime', label: '下发时间', filter: parseTime, - minWidth: 150 + minWidth: 160 }, { prop: 'name', @@ -147,19 +148,19 @@ const tableProps1 = [ minWidth: 150 }, { - prop: 'planQuantity', + prop: 'planAssignmentQuantity', label: '计划加工量', - width: 90 + width: 100 }, { prop: 'actualQuantity', label: '实际加工量', - width: 90 + width: 100 }, { prop: 'actualArea', label: '加工平方数', - width: 90 + width: 100 }, { prop: 'status', @@ -170,13 +171,13 @@ const tableProps1 = [ prop: 'startProduceTime', label: '开始时间', filter: parseTime, - minWidth: 150 + minWidth: 160 }, { prop: 'finishProduceTime', label: '结束时间', filter: parseTime, - minWidth: 150 + minWidth: 160 }, { prop: 'productLineNames', @@ -278,6 +279,10 @@ export default { } }) }) + }, + // 返回 + returnOrderManage() { + this.$router.push({path: '/order/base/order-manage'}) } } } diff --git a/src/views/order/monitoring/components/monitoringRingCharts.vue b/src/views/order/monitoring/components/monitoringRingCharts.vue new file mode 100644 index 00000000..54a55a19 --- /dev/null +++ b/src/views/order/monitoring/components/monitoringRingCharts.vue @@ -0,0 +1,168 @@ + + + \ 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" /> - - + + + + +
+ + + + - - +
+ +