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,52 +1,46 @@
 <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>
 export default {
-	props: {
+  props: {
-		injectData: {
+    injectData: {
-			type: Object,
+      type: Object,
-			default: () => ({}),
+      default: () => ({})
-		},
+    }
-	},
+  },
-	data() {
+  data() {
-		return {
+    return {
-			state: false,
+      state: false
-		};
+    }
-	},
+  },
-	computed: {
+  computed: {
-		readonly() {
+    readonly() {
-			return !!this.injectData.readonly;
+      return !!this.injectData.readonly
-		},
+    }
-	},
+  },
-	mounted() {
+  mounted() {
-		this.mapToState();
+    this.mapToState()
-	},
+  },
-	methods: {
+  methods: {
-		mapToState() {
+    mapToState() {
-			if (this.injectData.prop === 'enabled') {
+      if (this.injectData.prop === 'enabled') {
-				this.state = this.injectData.enabled === 1 ? true : false;
+        this.state = this.injectData.enabled === 1 ? true : false
-			}
+      }
-		},
+    },
-		changeHandler() {
+    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,51 +1,41 @@
 <template>
-	<div class="workerOperate">
+  <div class="workerOperate">
-		<div class="operateBtn">
+    <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']"
+    </div>
-				@click="emitParams('view')">
+  </div>
-				查看
-			</span>
-			<span
-				class="edit"
-				v-hasPermi="['base:group-team:edit-worker']"
-				@click="emitParams('edit')">
-				编辑
-			</span>
-		</div>
-	</div>
 </template>
 <script>
 export default {
-	name: 'WorkerOperate',
+  name: 'WorkerOperate',
-	props: {
+  props: {
-		injectData: {
+    injectData: {
-			type: Object,
+      type: Object,
-			default: () => ({}),
+      default: () => ({})
-		},
+    }
-	},
+  },
-	methods: {
+  methods: {
-		emitParams(data) {
+    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 {
+  .operateBtn{
-		color: #0b58ff;
+    color: #0B58FF;
-		.view {
+    .view {
-			margin-right: 10px;
+      margin-right: 10px;
-			cursor: pointer;
+      cursor: pointer;
-		}
+    }
-		.edit {
+    .edit {
-			cursor: pointer;
+      cursor: pointer;
-		}
+    }
-	}
+  }
 }
 </style>

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/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',
-							type: 'detail',
+					btnName: '详情',
-							btnName: '详情',
+				},
-					  }
+				this.$auth.hasPermi('base:order-group:edit')
-					: undefined,
-				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: '删除',