src/views/energy/analysis/contrastAnalysis/components/barChart.vue

@@ -76,6 +76,10 @@ export default {
 					name: this.chartData[i].objName + this.chartData[i].objCode,
 					type: 'bar',
 					barMaxWidth: 20,
+					label: {
+						show: true,
+						position: 'top',
+					},
 					data: [],
 				};
 				legendData.push(this.chartData[i].objName + this.chartData[i].objCode);

src/views/energy/analysis/trendAnalysis/components/lineChart.vue

@@ -68,9 +68,9 @@ export default {
 
 			var option = {
 				color: ['#288AFF'],
-				tooltip: {
+				// tooltip: {
-					trigger: 'axis',
+				//   trigger: 'axis'
-				},
+				// },
 				grid: {
 					left: '4%',
 					right: '1%',

src/views/energy/analysis/trendAnalysis/index.vue

@@ -57,10 +57,8 @@ export default {
 			let listObj = { useNum: '消耗量' }; // 数据
 			for (let i = 0; i < arr.length; i++) {
 				let obj = {};
-				let fName = arr[i].time.slice(0, 4);
-				let lName = arr[i].time.slice(4, 6);
 				obj.prop = arr[i].time;
-				obj.label = fName + ' 第 ' + lName + ' 周';
+				obj.label = arr[i].time;
 				obj.minWidth = 100;
 				tempX.push(obj);
 				listObj[arr[i].time] = arr[i].useNum || null;

src/views/energy/base/energyQuantityManual/components/AddTable.vue

@@ -45,7 +45,6 @@
 			</el-table-column>
 		</el-table>
 		<el-button
-			v-show="!isEdit"
 			class="addButton"
 			icon="el-icon-plus"
 			@click="emitButtonClick">
@@ -71,13 +70,6 @@ export default {
 				return [];
 			},
 		},
-		isEdit: {
-			type: Boolean,
-			required: true,
-			default: () => {
-				return false;
-			},
-		},
 	},
 	data() {
 		return {};

src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue

@@ -42,7 +42,6 @@
 				<add-table
 					:table-data="tableData"
 					:table-name-list="tableNameList"
-					:isEdit="isEdit"
 					@emitFun="inputChange"
 					@emitButtonClick="emitButtonClick" />
 			</el-col>

src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue

@@ -66,7 +66,7 @@
 						placeholder="请选择"
 						style="width: 100%">
 						<el-option
-							v-for="item in tableNameList"
+							v-for="item in getDictDatas(DICT_TYPE.TABLE_NAME)"
 							:key="item.value"
 							:label="item.label"
 							:value="item.value"></el-option>
@@ -154,7 +154,6 @@ import {
 	createEnergyLimit,
 	getEnergyParamList,
 } from '@/api/monitoring/energyLimit';
-import { energyTableGet } from '@/api/base/energyQuantityManual';
 export default {
 	name: 'energyLimitAdd',
 	props: {
@@ -204,7 +203,6 @@ export default {
 					{ required: true, message: '指标类型不能为空', trigger: 'change' },
 				],
 			},
-			tableNameList: [],
 			detailList: [],
 		};
 	},
@@ -269,22 +267,11 @@ export default {
 			}
 		},
 		toggleType() {
-			if (this.form.energyTypeId && this.form.method == 2) {
+			if (this.form.energyTypeId && this.form.type) {
-				this.form.tableName = '';
+				this.getDetailList();
-				this.getTableNameList(this.form.energyTypeId);
+				this.form.plcParamId = '';
 			}
 		},
-		// 获取能源表名list
-		getTableNameList(id) {
-			energyTableGet({ energyTypeId: id }).then((res) => {
-				this.tableNameList = res.data.tableObjs || [];
-				if (this.tableNameList.length === 0) {
-					this.$modal.msgWarning(
-						'当前能源类型暂无配置表名，请先到《表名配置》页面配置'
-					);
-				}
-			});
-		},
 		// 递归处理分类回显问题
 		changeDetSelect(key, treeData) {
 			let arr = []; // 递归时操作的数组

src/views/group/base/groupTeam/components/statusBtn.vue

@@ -1,11 +1,5 @@
 <template>
-	<el-switch
+  <el-switch v-model="state" type="text" size="small" :disabled="readonly" @change="changeHandler" />
-		v-hasPermi="['base:group-team:edit-worker']"
-		v-model="state"
-		type="text"
-		size="small"
-		:disabled="readonly"
-		@change="changeHandler" />
 </template>
 
 <script>
@@ -13,40 +7,40 @@ export default {
   props: {
     injectData: {
       type: Object,
-			default: () => ({}),
+      default: () => ({})
-		},
+    }
   },
   data() {
     return {
-			state: false,
+      state: false
-		};
+    }
   },
   computed: {
     readonly() {
-			return !!this.injectData.readonly;
+      return !!this.injectData.readonly
-		},
+    }
   },
   mounted() {
-		this.mapToState();
+    this.mapToState()
   },
   methods: {
     mapToState() {
       if (this.injectData.prop === 'enabled') {
-				this.state = this.injectData.enabled === 1 ? true : false;
+        this.state = this.injectData.enabled === 1 ? true : false
       }
     },
     changeHandler() {
-			let params = {};
+      let params = {}
-			let payload = {};
+      let payload = {}
-			params.name = 'state';
+      params.name = 'state'
-			payload.id = this.injectData.id;
+      payload.id = this.injectData.id
-			payload.enabled = this.state ? '1' : '0';
+      payload.enabled = this.state ? '1' : '0'
-			payload.code = this.injectData.code;
+      payload.code = this.injectData.code
-			payload.name = this.injectData.name;
+      payload.name = this.injectData.name
-			payload.leaderId = this.injectData.leaderId;
+      payload.leaderId = this.injectData.leaderId
-			params.payload = payload;
+      params.payload = payload
-			this.$emit('emitData', params);
+      this.$emit('emitData', params)
-		},
+    }
-	},
+  }
-};
+}
 </script>

src/views/group/base/groupTeam/components/workerOperate.vue

@@ -1,18 +1,8 @@
 <template>
   <div class="workerOperate">
     <div class="operateBtn">
-			<span
+      <span class="view" v-if="this.$auth.hasPermi('base:group-team:view-worker')" @click="emitParams('view')">查看</span>
-				class="view"
+      <span class="edit" v-if="this.$auth.hasPermi('base:group-team:edit-worker')" @click="emitParams('edit')">编辑</span>
-				v-hasPermi="['base:group-team:view-worker']"
-				@click="emitParams('view')">
-				查看
-			</span>
-			<span
-				class="edit"
-				v-hasPermi="['base:group-team:edit-worker']"
-				@click="emitParams('edit')">
-				编辑
-			</span>
     </div>
   </div>
 </template>
@@ -22,23 +12,23 @@ export default {
   props: {
     injectData: {
       type: Object,
-			default: () => ({}),
+      default: () => ({})
-		},
+    }
   },
   methods: {
     emitParams(data) {
-			let params = {};
+      let params = {}
-			params.name = data;
+      params.name = data
-			params.payload = this.injectData;
+      params.payload = this.injectData
-			this.$emit('emitData', params);
+      this.$emit('emitData', params)
-		},
+    }
-	},
+  }
-};
+}
 </script>
 <style lang='scss' scoped>
 .workerOperate {
   .operateBtn{
-		color: #0b58ff;
+    color: #0B58FF;
     .view {
       margin-right: 10px;
       cursor: pointer;

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

@@ -125,7 +125,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:group-team:create') ? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('base:group-team:create') ? 'button' : '',

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

@@ -1,12 +1,8 @@
 <template>
   <div class="groupTeamScheduling">
-		<TopTab
+    <TopTab :roomNameDict='roomNameDict' @emitFun='toggleName'/>
-			:roomNameDict="roomNameDict"
-			@emitFun="toggleName" />
     <div class="operationArea">
-			<el-form
+      <el-form :inline="true" class="demo-form-inline">
-				:inline="true"
-				class="demo-form-inline">
         <span class="blue-block"></span>
         <el-form-item label="月份选择">
           <el-date-picker
@@ -17,81 +13,37 @@
             :disabled="showSetting"
             @change="selectMonth"
             :clearable="false"
-						style="width: 120px"></el-date-picker>
+            style="width: 120px">
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
-					<span
+          <span class="separateStyle" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
-						class="separateStyle"
-						v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
         </el-form-item>
         <el-form-item>
-					<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>
-						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
+          <el-button type="primary" size="small" v-show="showSetting && autoScheduling" @click="schedulingBtn">自动排班</el-button>
-						type="primary"
-						size="small"
-						v-show="showSetting && autoScheduling"
-						@click="schedulingBtn">
-						自动排班
-					</el-button>
         </el-form-item>
         <el-form-item>
-					<span
+          <span class="separateStyle" v-show="showSetting"></span>
-						class="separateStyle"
-						v-show="showSetting"></span>
         </el-form-item>
         <el-form-item>
-					<el-button
+          <el-button type="primary" size="small" v-show="showSetting" @click="confirmSetting">确认</el-button>
-						type="primary"
-						size="small"
-						v-show="showSetting"
-						@click="confirmSetting">
-						确认
-					</el-button>
         </el-form-item>
         <el-form-item>
-					<el-button
+          <el-button type="primary" size="small" plain v-show="showSetting" @click="cancelSetting">取消</el-button>
-						type="primary"
-						size="small"
-						plain
-						v-show="showSetting"
-						@click="cancelSetting">
-						取消
-					</el-button>
         </el-form-item>
-				<el-form-item
+        <el-form-item label="请先选择查询的班组" class="rightItem">
-					v-hasPermi="[
-						'base:quality-inspection-record:query',
-						'base:core-work-order:query',
-						'base:core-product:query',
-					]"
-					label="请先选择查询的班组"
-					class="rightItem">
           <!-- <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('1')">班组上下片查询</el-button> -->
-					<!-- <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('2')">班组能源查询</el-button> -->
+          <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('2')">班组能源查询</el-button>
-					<el-button
+          <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('3')">班组检测查询</el-button>
-						type="primary"
-						size="small"
-						:disabled="jumpDisabled"
-						@click="toOtherPage('3')">
-						班组检测查询
-					</el-button>
         </el-form-item>
       </el-form>
     </div>
     <!-- 日历区域 -->
     <div class="calenderArea">
-			<div style="font-size: 24px; font-weight: 500">
+      <div style="font-size: 24px;font-weight: 500">{{ this.month }} {{ this.year }}</div>
-				{{ this.month }} {{ this.year }}
-			</div>
       <el-calendar v-model="startDay">
         <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
         <template
@@ -104,64 +56,27 @@
             </div>
             <!-- 班次班组 -->
             <!-- class有两个样式，一个是类似class1，还有个是选中红框显示 -->
-						<el-row
+            <el-row :gutter="2" :class="'class' + (index+1) + (chooseTip === (item.startDay+item.classesId) ? ' team-active' : '')" v-for="(item, index) in list[Number(data.day.split('-')[2])]" :key='index'>
-							:gutter="2"
-							:class="
-								'class' +
-								(index + 1) +
-								(chooseTip === item.startDay + item.classesId
-									? ' team-active'
-									: '')
-							"
-							v-for="(item, index) in list[Number(data.day.split('-')[2])]"
-							:key="index">
               <el-col :span="12">
                 <div class="selectDiv">
                   <!-- 选择班组图标 -->
-									<div
+                  <div class="toggle-icon" v-show="showSetting && (new Date(data.day).valueOf() < new Date().valueOf() ? false: true)">
-										class="toggle-icon"
-										v-show="
-											showSetting &&
-											(new Date(data.day).valueOf() < new Date().valueOf()
-												? false
-												: true)
-										">
                     <svg-icon icon-class="toggle"/>
                   </div>
                   <!-- 不能选择班组 -->
-									<div
+                  <div class="toggle-icon-hide" v-show="!(showSetting && (new Date(data.day).valueOf() < new Date().valueOf() ? false: true))"></div>
-										class="toggle-icon-hide"
+                  <el-select v-model="item.teamId" size='small' :disabled="!showSetting || (new Date(data.day).valueOf() > new Date().valueOf() ? false: true)">
-										v-show="
-											!(
-												showSetting &&
-												(new Date(data.day).valueOf() < new Date().valueOf()
-													? false
-													: true)
-											)
-										"></div>
-									<el-select
-										v-model="item.teamId"
-										size="small"
-										:disabled="
-											!showSetting ||
-											(new Date(data.day).valueOf() > new Date().valueOf()
-												? false
-												: true)
-										">
                     <el-option
                       v-for="i in teamList"
                       :key="i.id"
                       :label="i.name"
-											:value="i.id"></el-option>
+                      :value="i.id">
+                    </el-option>
                   </el-select>
               </div>
               </el-col>
               <el-col :span="12">
-								<el-button
+                <el-button class="labelClass" @click="chooseTeam(item)">{{ item.classesName }}</el-button>
-									class="labelClass"
-									@click="chooseTeam(item)">
-									{{ item.classesName }}
-								</el-button>
               </el-col>
             </el-row>
           </div>
@@ -172,37 +87,20 @@
 </template>
 
 <script>
-import {
+import { getPreset, createOrUpdateList, autoSet } from "@/api/base/groupTeamScheduling";
-	getPreset,
+import { listEnabledByRoom } from "@/api/base/groupTeam";
-	createOrUpdateList,
-	autoSet,
-} from '@/api/base/groupTeamScheduling';
-import { listEnabledByRoom } from '@/api/base/groupTeam';
 import moment from 'moment';
-import TopTab from './components/topTab';
+import TopTab from './components/topTab'
 
 export default {
-	name: 'GroupTeamScheduling',
+  name: "GroupTeamScheduling",
   data() {
     return {
       roomNameDict:null,
       startDay: '',// 查询参数
       year: '',// 2023
       month: '',// 九月
-			monthList: [
+      monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
-				'一月',
-				'二月',
-				'三月',
-				'四月',
-				'五月',
-				'六月',
-				'七月',
-				'八月',
-				'九月',
-				'十月',
-				'十一月',
-				'十二月',
-			],
       list: {},
       teamList: [],// 班组下拉
       showSetting: false,// 设置模式。自动排班，确认，取消按钮显示
@@ -210,261 +108,242 @@ export default {
       jumpDisabled: true,// 操作按钮控制
       chooseObj: {}, //当前选中的数据，查询按钮用
       chooseTip: '',// 当前选中数据的唯一值，显示红框
-			autoScheduling: false, // 只有在当前日期后的月份才生效
+      autoScheduling: false // 只有在当前日期后的月份才生效
     };
   },
   components:{ TopTab },
   created() {
-		this.roomNameDict = this.getDictDatas('workshop')[0].value;
+    this.roomNameDict = this.getDictDatas('workshop')[0].value
-		this.startDay = new Date();
+    this.startDay = new Date()
     // 设置按钮是否置灰
-		this.settingBtn();
+    this.settingBtn()
-		this.getTeamList();
+    this.getTeamList()
-		this.toggleMonth();
+    this.toggleMonth()
-		this.getList();
+    this.getList()
   },
   methods: {
     // 切换车间
     toggleName(val) {
-			this.roomNameDict = val;
+      this.roomNameDict = val
       // 如果当前在设置，则取消设置
       if (this.showSetting) {
-				this.showSetting = !this.showSetting;
+        this.showSetting = !this.showSetting
       }
       // 如果红框选中，清除红框选中
       if (!this.jumpDisabled) {
-				this.clearChoose();
+        this.clearChoose()
       }
       // 获取班组列表
-			this.getTeamList();
+      this.getTeamList()
       // 重新获取日历数据
-			this.getList();
+      this.getList()
     },
     // 切换月份
     selectMonth() {
       if (this.startDay) {
-				this.settingBtn(); // 设置按钮状态,需在getlist前面
+        this.settingBtn() // 设置按钮状态,需在getlist前面
-				this.toggleMonth();
+        this.toggleMonth()
-				this.getList();
+        this.getList()
-				this.clearChoose();
+        this.clearChoose()
-				if (
+        if ( moment(this.startDay).valueOf() > moment().endOf('month').valueOf()) {
-					moment(this.startDay).valueOf() > moment().endOf('month').valueOf()
+          this.autoScheduling = true
-				) {
-					this.autoScheduling = true;
         } else {
-					this.autoScheduling = false;
+          this.autoScheduling = false
         }
       }
     },
     // 获取班组列表
     getTeamList() {
-			console.log(this.roomNameDict);
+      console.log(this.roomNameDict)
       listEnabledByRoom({
-				room: this.roomNameDict,
+        room: this.roomNameDict
-			}).then((res) => {
+      }).then(res => {
-				this.teamList = res.data || [];
+        this.teamList = res.data || []
-			});
+      })
     },
     // 获取日历数据
     getList() {
-			let year = moment(this.startDay).format('YYYY');
+      let year = moment(this.startDay).format('YYYY')
-			let month = moment(this.startDay).format('M');
+      let month = moment(this.startDay).format('M')
       getPreset({
         year: year,
         month: month,
-				roomNameDict: this.roomNameDict,
+        roomNameDict: this.roomNameDict
-			})
+      }).then(res => {
-				.then((res) => {
+        let obj = res.data || {}
-					let obj = res.data || {};
         if (obj) {
           for (let item in obj) {
             for (let i = 0; i < obj[item].length; i++) {
               if (!obj[item][i].teamId) {
-									obj[item][i].teamId = '';
+                obj[item][i].teamId = ''
               }
             }
           }
         }
-					this.list = obj;
+        this.list = obj
-					this.settingBtnDis = false;
+        this.settingBtnDis = false
+      }).catch(() => {
+        this.list = {}
+        this.settingBtnDis = true // 禁用设置按钮
       })
-				.catch(() => {
-					this.list = {};
-					this.settingBtnDis = true; // 禁用设置按钮
-				});
     },
     // 设置
     settingMsg() {
-			this.showSetting = !this.showSetting;
+      this.showSetting = !this.showSetting
-			this.clearChoose();
+      this.clearChoose()
     },
     // 取消
     cancelSetting() {
-			this.showSetting = !this.showSetting;
+      this.showSetting = !this.showSetting
-			this.getList(); // 数据还原
+      this.getList() // 数据还原
     },
     // 确认
     confirmSetting() {
-			let num = 0;
+      let num = 0
       // 当月数据的话，今天及今天之前的不传
-			if (
+      if (moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')) {
-				moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')
+        num = Number(moment().format('DD'))
-			) {
-				num = Number(moment().format('DD'));
       } else {
-				num = 0;
+        num = 0
       }
       // 下月数据全部都传
       // 打平数据
-			let tempArr = Object.values(this.list);
+      let tempArr = Object.values(this.list)
-			let arr = [];
+      let arr = []
       for (let i = num; i < tempArr.length; i++) {
         for (let j = 0; j < tempArr[i].length; j++) {
-					arr.push(tempArr[i][j]);
+          arr.push(tempArr[i][j])
         }
       }
-			createOrUpdateList(arr).then((res) => {
+      createOrUpdateList(arr).then(res => {
         if (res.code === 0) {
-					this.showSetting = !this.showSetting;
+          this.showSetting = !this.showSetting
-					this.$modal.msgSuccess('操作成功');
+          this.$modal.msgSuccess("操作成功")
-					this.getList(); // 数据更新
+          this.getList() // 数据更新
         }
-			});
+      })
     },
     // 点击班次红框选中当前数据
     chooseTeam(value) {
       if (this.showSetting) {
-				this.$modal.msgWarning('当前处于设置模式');
+        this.$modal.msgWarning("当前处于设置模式")
-				return false;
+        return false
       }
-			this.chooseObj = value;
+      this.chooseObj = value
-			this.chooseTip = value.startDay + value.classesId; // 匹配当前的样式
+      this.chooseTip = value.startDay + value.classesId // 匹配当前的样式
-			this.jumpDisabled = false; //查询按钮不禁用
+      this.jumpDisabled = false //查询按钮不禁用
     },
     // 自动排班
     schedulingBtn() {
-			let tempData = this.list;
+      let tempData = this.list
       // 次月1号有值前端排班
       if (this.list[1][0].teamId) {
-				let tempArr = Object.values(this.list);
+        let tempArr = Object.values(this.list)
-				let arr = [];
+        let arr = []
-				let n = 0;
+        let n = 0
         for (let i = 0; i < tempArr.length; i++) {
           if (n > 0) {
             break;
           }
           for (let j = 0; j < tempArr[i].length; j++) {
             if (tempArr[i][j].teamId) {
-							arr.push(tempArr[i][j].teamId);
+              arr.push(tempArr[i][j].teamId)
             } else {
-							n++;
+              n++
             }
           }
         }
-				let tempNum = 0;
+        let tempNum = 0
         for (let k = 0; k < tempArr.length; k++) {
           for (let v = 0; v < tempArr[k].length; v++) {
-						let t = tempNum % arr.length;
+            let t = tempNum % arr.length
             if (arr.length === 1) {
-							tempData[k + 1][v].teamId = arr[0];
+              tempData[k+1][v].teamId = arr[0]
             } else {
-							tempData[k + 1][v].teamId = arr[t];
+              tempData[k+1][v].teamId = arr[t]
             }
-						tempNum++;
+            tempNum++
           }
         }
-				this.list = [];
+        this.list = []
-				this.list = tempData;
+        this.list = tempData
       } else {
         // 次月1号没有值,接口排班
         // console.log(moment(this.startDay).format("YYYY-MM-DD"))
         autoSet({
           year: this.year,
           month: moment(this.startDay).month() + 1,
-					roomNameDict: this.roomNameDict,
+          roomNameDict: this.roomNameDict
-				}).then((res) => {
+        }).then(res => {
-					this.list = res.data || {};
+          this.list = res.data || {}
-				});
+        })
       }
     },
     // 设置按钮如果是上个月或者今天是本月最后一天，设置按钮置灰
     settingBtn() {
-			let nowMonth = moment().startOf('month').valueOf();
+      let nowMonth = moment().startOf('month').valueOf()
-			let startMonth = moment(this.startDay).valueOf();
+      let startMonth = moment(this.startDay).valueOf()
-			let nowDate = moment(new Date()).date();
+      let nowDate = moment(new Date()).date()
-			let sumDate = moment().daysInMonth();
+      let sumDate = moment().daysInMonth()
-			if (nowMonth > startMonth) {
+      if (nowMonth > startMonth) { // 之前月
-				// 之前月
+        this.settingBtnDis = true
-				this.settingBtnDis = true;
       } else {
         if (nowDate < sumDate) {
-					this.settingBtnDis = false;
+          this.settingBtnDis = false
         } else {
-					this.settingBtnDis = true;
+          this.settingBtnDis = true
         }
       }
     },
     // 清除红框选中数据
     clearChoose() {
-			this.chooseObj = {};
+      this.chooseObj = {}
-			this.chooseTip = '';
+      this.chooseTip = ""
-			this.jumpDisabled = true;
+      this.jumpDisabled = true
     },
     // 切换月份显示
     toggleMonth() {
-			this.year = moment(this.startDay).format('YYYY');
+      this.year = moment(this.startDay).format("YYYY")
-			let month = Number(moment(this.startDay).format('MM'));
+      let month = Number(moment(this.startDay).format("MM"))
-			this.month = this.monthList[month - 1];
+      this.month = this.monthList[month - 1]
     },
     // 3个跳转按钮
     toOtherPage(val) {
       switch (val) {
         case '1':
           this.$router.push({
-						path:
+            path: '/core/enhance/product-line-24h?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime,
-							'/core/enhance/product-line-24h?startTime=' +
+          })
-							this.chooseObj.startTime +
-							'&endTime=' +
-							this.chooseObj.endTime,
-					});
           break;
         case '2': // 能源
           this.$router.push({
-						path:
+            path: '/energy/base/energy-quantity-realtime?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
-							'/energy/base/energy-quantity-realtime?startTime=' +
+          })
-							this.chooseObj.startTime +
-							'&endTime=' +
-							this.chooseObj.endTime,
-					});
           break;
         default:
           this.$router.push({
-						path:
+            path: '/quality/base/quality-inspection-data/detection-information/statistical-data?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime,
-							'/quality/base/quality-inspection-data/detection-information/statistical-data?startTime=' +
-							this.chooseObj.startTime +
-							'&endTime=' +
-							this.chooseObj.endTime,
             // name: 'QualityStatistics',
             // params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
-					});
+          })
+      }
+    }
+    }
   }
-		},
-	},
-};
 </script>
 <style lang='scss'>
 .demo-form-inline {
   .el-date-editor .el-range__icon {
     font-size: 16px;
-		color: #0b58ff;
+    color: #0B58FF;
   }
   .el-input__prefix .el-icon-date {
     font-size: 16px;
-		color: #0b58ff;
+    color: #0B58FF;
   }
 }
 .groupTeamScheduling {
-	background-color: #f2f4f9;
+  background-color: #F2F4F9;
   .operationArea {
     padding: 14px 10px 0 16px;
     margin-bottom: 8px;
@@ -474,7 +353,7 @@ export default {
       display: inline-block;
       width: 4px;
       height: 16px;
-			background-color: #0b58ff;
+      background-color: #0B58FF;
       border-radius: 1px;
       margin-right: 8px;
       margin-top: 10px;
@@ -483,7 +362,7 @@ export default {
       display: inline-block;
       width: 1px;
       height: 24px;
-			background: #e8e8e8;
+      background: #E8E8E8;
       vertical-align: middle;
     }
     .el-form-item {
@@ -515,8 +394,7 @@ export default {
     }
     .el-calendar-table__row {
       height: 133px;
-			.prev,
+      .prev, .next {
-			.next {
         pointer-events: none;
       }
       .el-calendar-day {
@@ -533,13 +411,10 @@ export default {
         }
       }
     }
-		.team-active {
+    .team-active {// 选中班组
-			// 选中班组
+      border:2px solid red
-			border: 2px solid red;
     }
-		.class1,
+    .class1, .class2, .class3 {
-		.class2,
-		.class3 {
       padding: 0;
       font-weight: 600;
       margin-bottom: 2px;
@@ -583,50 +458,47 @@ export default {
     }
     .class1 {
       .selectDiv {
-				.toggle-icon,
+        .toggle-icon, .toggle-icon-hide {
-				.toggle-icon-hide {
+          background-color: #FACE00;
-					background-color: #face00;
         }
         .el-input--small .el-input__inner {
-					color: #e7a200;
+          color: #E7A200;
-					background-color: #ffefc0;
+          background-color: #FFEFC0;
         }
       }
       .labelClass {
-				color: #e7a200;
+        color: #E7A200;
-				background-color: #ffefc0;
+        background-color: #FFEFC0;
       }
     }
     .class2 {
       .selectDiv {
-				.toggle-icon,
+        .toggle-icon, .toggle-icon-hide {
-				.toggle-icon-hide {
+          background-color: #3984FF;
-					background-color: #3984ff;
         }
         .el-input--small .el-input__inner {
-					color: #2d7bff;
+          color: #2D7BFF;
-					background-color: #beeaff;
+          background-color: #BEEAFF;
         }
       }
       .labelClass {
-				color: #2d7bff;
+        color: #2D7BFF;
-				background-color: #beeaff;
+        background-color: #BEEAFF;
       }
     }
     .class3 {
       .selectDiv {
-				.toggle-icon,
+        .toggle-icon, .toggle-icon-hide {
-				.toggle-icon-hide {
+          background-color: #37D97F;
-					background-color: #37d97f;
         }
         .el-input--small .el-input__inner {
-					color: #129f51;
+          color: #129F51;
-					background-color: #e0ffee;
+          background-color: #E0FFEE;
         }
       }
       .labelClass {
-				color: #129f51;
+        color: #129F51;
-				background-color: #e0ffee;
+        background-color: #E0FFEE;
       }
     }
   }

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

@@ -88,7 +88,7 @@ export default {
 			workOrderList: [],
 			workOrderName: '',
 			tableBtn: [
-				this.$auth.hasPermi('monitoring:group-team-scheduling:query')
+				this.$auth.hasPermi('base:group-team-view:detail')
 					? {
 							type: 'detail',
 							btnName: '详情',

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

@@ -97,7 +97,7 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi('monitoring:group-team-scheduling:query')
+				this.$auth.hasPermi('base:team-production:detail')
 					? {
 							type: 'productionDetail',
 							btnName: '查看',

src/views/order/base/orderGroup/index.vue

@@ -173,24 +173,12 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('base:order-group:create')
-						'base:order-group:create',
-						'base:core-product:query',
-						'base:core-customer:query',
-						'base:order:query',
-					])
 						? 'separate'
 						: '',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('base:order-group:create') ? 'button' : '',
-						'base:order-group:create',
-						'base:core-product:query',
-						'base:core-customer:query',
-						'base:order:query',
-					])
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -209,10 +197,7 @@ export default {
 			tableProps,
 			list: [],
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('base:order-group:bind')
-					'base:order:query',
-					'base:order-con-group-order:create',
-				])
 					? {
 							type: 'bind',
 							btnName: '绑定',
@@ -229,7 +214,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-group:update')
+				this.$auth.hasPermi('base:order-group:complete')
 					? {
 							type: 'complete',
 							btnName: '完成',
@@ -246,7 +231,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-group:update')
+				this.$auth.hasPermi('base:order-group:termination')
 					? {
 							type: 'termination',
 							btnName: '终止',
@@ -263,7 +248,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-group:update')
+				this.$auth.hasPermi('base:order-group:cancel')
 					? {
 							type: 'cancel',
 							btnName: '作废',
@@ -280,17 +265,11 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-group:update')
+				{
-					? {
 					type: 'detail',
 					btnName: '详情',
-					  }
+				},
-					: undefined,
+				this.$auth.hasPermi('base:order-group:edit')
-				this.$auth.hasPermiAnd([
-					'base:order-group:update',
-					'base:core-product:query',
-					'base:core-customer:query',
-				])
 					? {
 							type: 'edit',
 							btnName: '编辑',

src/views/order/base/orderManage/index.vue

@@ -15,7 +15,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="250"
+				:width="290"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -169,22 +169,12 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('base:order-manage:create')
-						'base:order:query',
-						'base:core-product:query',
-						'base:order:create',
-					])
 						? 'separate'
 						: '',
 				},
 				{
-					type: this.$auth.hasPermiAnd([
+					type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
-						'base:order:query',
-						'base:core-product:query',
-						'base:order:create',
-					])
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -220,14 +210,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('base:order-manage:bindWorkOrder')
-					'base:order:update',
-					'base:core-product:query',
-					'base:production-line:query',
-					'extend:process-flow:query',
-					'base:core-work-order:query',
-					'base:order:query',
-				])
 					? {
 							type: 'bind',
 							btnName: '绑定',
@@ -244,7 +227,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order:update')
+				this.$auth.hasPermi('base:order-manage:complete')
 					? {
 							type: 'complete',
 							btnName: '完成',
@@ -261,7 +244,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order:update')
+				this.$auth.hasPermi('base:order-manage:termination')
 					? {
 							type: 'termination',
 							btnName: '终止',
@@ -278,7 +261,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order:update')
+				this.$auth.hasPermi('base:order-manage:cancel')
 					? {
 							type: 'cancel',
 							btnName: '作废',
@@ -295,20 +278,13 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('base:order-manage:detail')
-					'base:order:query',
-					'extend:process-flow:query',
-				])
 					? {
 							type: 'detail',
 							btnName: '详情',
 					  }
 					: undefined,
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('base:order-manage:edit')
-					'base:order:query',
-					'base:core-product:query',
-					'base:order:update',
-				])
 					? {
 							type: 'edit',
 							btnName: '编辑',

src/views/order/monitoring/orderCompletionMonitoring/index.vue

@@ -181,10 +181,7 @@ export default {
 			list: [],
 			total: 0,
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
-					'base:order:query',
-					'extend:process-flow:query',
-				])
 					? {
 							type: 'orderDetail',
 							btnName: '详情',
@@ -201,11 +198,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
-					'base:quality-inspection-record:query',
-					'base:core-product:query',
-					'base:core-work-order:query',
-				])
 					? {
 							type: 'qualityDetail',
 							btnName: '质量',

src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue

@@ -99,14 +99,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:environmental-check-record:export')
+					type: this.$auth.hasPermi('base:voc:export') ? 'separate' : '',
-						? 'separate'
-						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:environmental-check-record:export')
+					type: this.$auth.hasPermi('base:voc:export') ? 'button' : '',
-						? 'button'
-						: '',
 					btnName: '导出',
 					name: 'export',
 					color: 'primary',

src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue

@@ -103,14 +103,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:environmental-check:create')
+					type: this.$auth.hasPermi('base:voc:create') ? 'separate' : '',
-						? 'separate'
-						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:environmental-check:create')
+					type: this.$auth.hasPermi('base:voc:create') ? 'button' : '',
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -128,16 +124,13 @@ export default {
 			tableProps,
 			list: [],
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('base:voc:update')
-					'base:environmental-check:update',
-					'base:environmental-check:query',
-				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:environmental-check:delete')
+				this.$auth.hasPermi('base:voc:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',

src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue

@@ -99,14 +99,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:environmental-check-record:export')
+					type: this.$auth.hasPermi('base:waste-gas:export') ? 'separate' : '',
-						? 'separate'
-						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:environmental-check-record:export')
+					type: this.$auth.hasPermi('base:waste-gas:export') ? 'button' : '',
-						? 'button'
-						: '',
 					btnName: '导出',
 					name: 'export',
 					color: 'primary',

src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue

@@ -103,14 +103,10 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:environmental-check:create')
+					type: this.$auth.hasPermi('base:waste-gas:create') ? 'separate' : '',
-						? 'separate'
-						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:environmental-check:create')
+					type: this.$auth.hasPermi('base:waste-gas:create') ? 'button' : '',
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -128,16 +124,13 @@ export default {
 			tableProps,
 			list: [],
 			tableBtn: [
-				this.$auth.hasPermiAnd([
+				this.$auth.hasPermi('base:waste-gas:update')
-					'base:environmental-check:update',
-					'base:environmental-check:query',
-				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:environmental-check:delete')
+				this.$auth.hasPermi('base:waste-gas:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',

src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue

@@ -99,14 +99,12 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:environmental-check-record:export')
+					type: this.$auth.hasPermi('base:waste-water:export')
 						? 'separate'
 						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:environmental-check-record:export')
+					type: this.$auth.hasPermi('base:waste-water:export') ? 'button' : '',
-						? 'button'
-						: '',
 					btnName: '导出',
 					name: 'export',
 					color: 'primary',

src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue

@@ -103,14 +103,12 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:environmental-check:create')
+					type: this.$auth.hasPermi('base:waste-water:create')
 						? 'separate'
 						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:environmental-check:create')
+					type: this.$auth.hasPermi('base:waste-water:create') ? 'button' : '',
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -128,13 +126,13 @@ export default {
 			tableProps,
 			list: [],
 			tableBtn: [
-				this.$auth.hasPermi('base:environmental-check:update')
+				this.$auth.hasPermi('base:waste-water:update')
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:environmental-check:delete')
+				this.$auth.hasPermi('base:waste-water:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',