From 73feff0d8bd8d7b6b421782e5b104a27e85e7793 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Mon, 17 Mar 2025 10:22:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../groupTeamView/components/groupTeamViewDetail.vue   |  4 +++-
 src/views/group/monitoring/groupTeamView/index.vue     |  3 ++-
 src/views/group/monitoring/teamProduction/index.vue    | 10 +++++-----
 src/views/produce/order/base/orderManage/index.vue     |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue b/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue
index 58c17c34..73b820cb 100644
--- a/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue
+++ b/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue
@@ -13,6 +13,8 @@
           </el-col>
         </el-row>
         <base-table
+          :page="1"
+          :limit="5000"
           :table-props="tableProps"
           :table-data="tableData"
           :max-height="tableH"
@@ -43,7 +45,7 @@ const tableProps = [
   },
   {
     prop: 'workTime',
-    label: '工作时长'
+    label: '工作时长(h)'
   }
 ]
 export default {
diff --git a/src/views/group/monitoring/groupTeamView/index.vue b/src/views/group/monitoring/groupTeamView/index.vue
index 2b1a4018..7a1844bb 100644
--- a/src/views/group/monitoring/groupTeamView/index.vue
+++ b/src/views/group/monitoring/groupTeamView/index.vue
@@ -62,7 +62,8 @@ export default {
           selectOptions: [],
           param: 'workOrderId',
           clearable: false,
-          filterable: true
+          filterable: true,
+          required: true
         },
         {
           type: 'button',
diff --git a/src/views/group/monitoring/teamProduction/index.vue b/src/views/group/monitoring/teamProduction/index.vue
index ede94465..d7ca22ca 100644
--- a/src/views/group/monitoring/teamProduction/index.vue
+++ b/src/views/group/monitoring/teamProduction/index.vue
@@ -38,6 +38,7 @@ import { groupTeamSchedulingPage, groupClassesListAll } from '@/api/monitoring/t
 import { parseTime } from '@/utils/ruoyi'
 import TeamProductionDetail from './components/teamProductionDetail'
 import tableHeightMixin from '@/mixins/tableHeightMixin';
+import moment from 'moment'
 const tableProps = [
   {
     prop: 'createTime',
@@ -53,14 +54,12 @@ const tableProps = [
   {
     prop: 'startTime',
     label: '上班时间',
-    filter: parseTime,
-    minWidth: 160
+    filter: (val) => moment(val).format('HH:mm')
   },
   {
     prop: 'endTime',
     label: '下班时间',
-    filter: parseTime,
-    minWidth: 160
+    filter: (val) => moment(val).format('HH:mm')
   },
   {
     prop: 'classesName',
@@ -70,7 +69,8 @@ const tableProps = [
   {
     prop: 'teamName',
     label: '班组名称',
-    showOverflowtooltip: true
+    showOverflowtooltip: true,
+    minWidth: 100
   }
 ]
 export default {
diff --git a/src/views/produce/order/base/orderManage/index.vue b/src/views/produce/order/base/orderManage/index.vue
index 6b12de46..a4b3cb99 100644
--- a/src/views/produce/order/base/orderManage/index.vue
+++ b/src/views/produce/order/base/orderManage/index.vue
@@ -97,7 +97,7 @@
 						"
 						@click="handleClick({ data: scope.row, type: 'bind' })"
 						v-hasPermi="['base:order-manage:bindWorkOrder']">
-						绑定工单
+						下发工单
 					</el-button>
 					<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
 					<el-button

From ceeb853783127983b389f2be0f2fc7c380239c37 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Mon, 17 Mar 2025 10:35:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=99=90=E5=88=B63?=
 =?UTF-8?q?=E6=A1=A3=E8=AE=A1=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../energy/energyType/components/energyTypeAdd.vue        | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/views/devConfig/energy/energyType/components/energyTypeAdd.vue b/src/views/devConfig/energy/energyType/components/energyTypeAdd.vue
index 2371203e..192cea88 100644
--- a/src/views/devConfig/energy/energyType/components/energyTypeAdd.vue
+++ b/src/views/devConfig/energy/energyType/components/energyTypeAdd.vue
@@ -220,10 +220,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 = ''
@@ -232,10 +228,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