bug

src/views/group/base/groupTeamScheduling/index.vue

@@ -16,10 +16,10 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <span class="separateStyle"></span>
+          <span class="separateStyle" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="small" :disabled="showSetting || settingBtnDis" @click="settingMsg">设置</el-button>
+          <el-button type="primary" size="small" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')" :disabled="showSetting || settingBtnDis" @click="settingMsg">设置</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" v-show="showSetting && autoScheduling" @click="schedulingBtn">自动排班</el-button>
@@ -285,21 +285,22 @@ export default {
       switch (val) {
         case '1':
           this.$router.push({
-            // path: '/core/monitoring/production-line-data',
-            name: 'ProductionLineData',
-            params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
+            path: '/core/enhance/product-line-24h?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime,
+            // name: 'ProductionLineData',
+            // params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
           })
           break;
         case '2': // 能源
           this.$router.push({
-            name: 'EnergyReportSearch',
-            params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
+            path: '/energy/monitoring/energy-report-search?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
+            // name: 'EnergyReportSearch',
+            // params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
           })
           break;
         default:
           this.$router.push({
-            // path: '/quality/monitoring/quality-statistics',
-            name: 'QualityStatistics',
+            path: '/quality/monitoring/quality-statistics',
+            // name: 'QualityStatistics',
             params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
           })
       }

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

@@ -49,12 +49,6 @@ const tableProps = [
     label: '上班次数'
   }
 ]
-const tableBtn = [
-  {
-    type: 'detail',
-    btnName: '详情'
-  }
-]
 export default {
   name: 'GroupTeamView',
   data() {
@@ -82,7 +76,14 @@ export default {
       },
       workOrderList: [],
       workOrderName: '',
-      tableBtn,
+      tableBtn: [
+      this.$auth.hasPermi('base:group-team-view:detail')
+          ? {
+              type: 'detail',
+              btnName: '详情'
+            }
+          : undefined
+      ].filter((v) => v),
       tableProps,
       tableH: this.tableHeight(220),
       list: [],

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

@@ -72,12 +72,6 @@ const tableProps = [
     showOverflowtooltip: true
   }
 ]
-const tableBtn = [
-  {
-    type: 'viewDetail',
-    btnName: '查看生产情况'
-  }
-]
 export default {
   name: 'GroupTeamScheduling',
   data() {
@@ -98,13 +92,14 @@ export default {
         {
           type: 'datePicker',
           label: '上班日期',
-          dateType: 'date',
+          dateType: 'daterange',
           format: 'yyyy-MM-dd',
           valueFormat: 'yyyy-MM-dd',
+          rangeSeparator: '-',
           // valueFormat: "timestamp",
-          param: 'startDay',
+          param: 'tiemStr',
           defaultSelect: '',
-          width: 200
+          width: 250
         },
         {
           type: 'button',
@@ -119,10 +114,17 @@ export default {
         pageSize: 20,
         classesId: '',
         teamName: '',
-        startDay: ''
+        startDay: []
       },
       tableProps,
-      tableBtn,
+      tableBtn: [
+      this.$auth.hasPermi('base:team-production:detail')
+          ? {
+              type: 'viewDetail',
+              btnName: '查看生产情况'
+            }
+          : undefined
+      ].filter((v) => v),
       list: [],
       tableH: this.tableHeight(260),
       total: 0,
@@ -142,7 +144,8 @@ export default {
       this.queryParams.pageNo = 1;
       this.queryParams.classesId = val.classesId
       this.queryParams.teamName = val.teamName
-      this.queryParams.startDay = val.startDay
+      this.queryParams.startDay[0] = val.tiemStr ? val.tiemStr[0] + ' 00:00:00' : ''
+      this.queryParams.startDay[1] = val.tiemStr ? val.tiemStr[1] + ' 23:59:59' : ''
       this.getList()
     },
     getList() {