src/views/devConfig/energy/energyType/components/energyTypeAdd.vue

@@ -220,6 +220,10 @@ 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 = ''
@@ -228,6 +232,10 @@ 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

src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue

@@ -13,8 +13,6 @@
           </el-col>
         </el-row>
         <base-table
-          :page="1"
-          :limit="5000"
           :table-props="tableProps"
           :table-data="tableData"
           :max-height="tableH"
@@ -45,7 +43,7 @@ const tableProps = [
   },
   {
     prop: 'workTime',
-    label: '工作时长(h)'
+    label: '工作时长'
   }
 ]
 export default {

src/views/group/monitoring/groupTeamView/index.vue

@@ -62,8 +62,7 @@ export default {
           selectOptions: [],
           param: 'workOrderId',
           clearable: false,
-          filterable: true,
-          required: true
+          filterable: true
         },
         {
           type: 'button',

src/views/group/monitoring/teamProduction/index.vue

@@ -38,7 +38,6 @@ 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',
@@ -54,12 +53,14 @@ const tableProps = [
   {
     prop: 'startTime',
     label: '上班时间',
-    filter: (val) => moment(val).format('HH:mm')
+    filter: parseTime,
+    minWidth: 160
   },
   {
     prop: 'endTime',
     label: '下班时间',
-    filter: (val) => moment(val).format('HH:mm')
+    filter: parseTime,
+    minWidth: 160
   },
   {
     prop: 'classesName',
@@ -69,8 +70,7 @@ const tableProps = [
   {
     prop: 'teamName',
     label: '班组名称',
-    showOverflowtooltip: true,
-    minWidth: 100
+    showOverflowtooltip: true
   }
 ]
 export default {

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