.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-04-08 16:46:49
+ # @LastEditTime: 2024-04-03 11:22:19
  # @LastEditors: DY
  # @Description:
 ###

src/views/base/coreWorkOrder/allocation.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-04-08 10:21:46
+ * @LastEditTime: 2024-03-22 08:53:20
  * @Description:
 -->
 <template>
@@ -214,9 +214,7 @@ export default {
 								actualQuantity: this.dataForm.actualQuantity
 							}).then(response => {
 								this.$modal.msgSuccess("操作成功！工单状态稍后将会更新！");
-								if (tempList.length > 0) {
+								this.saveData(tempList)
-									this.saveData(tempList)
-								}
 								this.visible = false;
 								this.$emit("refreshDataList");
 							});

src/views/base/coreWorkOrder/detail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-04-08 14:27:29
+ * @LastEditTime: 2024-03-21 16:52:46
  * @Description:
 -->
 <template>
@@ -182,8 +182,7 @@
 					:table-props="tableProps"
 					:page="listQuery.pageNo"
 					:limit="listQuery.pageSize"
-					:table-data="orderList"
+					:table-data="orderList">
-					:max-height="tableH">
 					<method-btn
 						v-if="!isdetail"
 						slot="handleBtn"
@@ -210,8 +209,7 @@
 					:table-props="tableProps1"
 					:page="listQuery1.pageNo"
 					:limit="listQuery1.pageSize"
-					:table-data="materialList"
+					:table-data="materialList" />
-					:max-height="tableH" />
 				<!-- <pagination
 					v-show="listQuery1.total > 0"
 					:total="listQuery1.total"
@@ -237,7 +235,6 @@ import SmallTitle from './SmallTitle';
 import { publicFormatter } from "@/utils/dict";
 import { parseTime } from '@/utils/ruoyi'
 import topTabVue from '../../order/base/orderManage/components/topTab.vue';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableBtn = [
 	{
@@ -295,11 +292,9 @@ const tableProps1 = [
 ];
 
 export default {
-	mixins: [tableHeightMixin],
 	components: { SmallTitle, topTabVue },
 	data() {
 		return {
-			heightNum: 380,
 			tableBtn,
 			tableProps,
 			tableProps1,
@@ -460,7 +455,7 @@ export default {
 				// this.listQuery.total = response.data.total;
 			});
 			// 获取预使用原料列表
-			console.log('111我看看', this.dataForm.materialMethod)
+			console.log()
 			if (this.dataForm.id) {
 				if (this.dataForm.materialMethod === 1) {
 					// 产品

src/views/base/coreWorkOrder/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -63,7 +62,7 @@ import {
 	getCoreWOList
 } from '@/api/base/coreWorkOrder';
 import { publicFormatter } from '@/utils/dict';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
 
 const tableProps = [
 	{
@@ -133,7 +132,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	components: {
 		AddWorkOrder,
 		AddOrUpdate,

src/views/base/packagingPrintLog/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-08 11:49:33
+ * @LastEditTime: 2024-02-28 10:38:34
  * @Description:
 -->
 <template>
@@ -128,7 +128,7 @@ export default {
           param: 'createTime',
         },
 				{
-          type: this.$auth.hasPermi('base:packaging-print-log:query') ? 'button' : '',
+					type: 'button',
 					btnName: '搜索',
 					name: 'search',
 					color: 'primary',

src/views/cost/energyCost/index.vue

@@ -32,7 +32,6 @@ import {
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -62,7 +61,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -71,6 +70,7 @@ export default {
 			},
 			tableData: [],
 			tableProps,
+      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -113,6 +113,9 @@ export default {
 	},
 	components: {},
 	created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
 		getEnergyTypeListAll().then((response) => {
 			this.formConfig[0].selectOptions = response.data;
 		});

src/views/cost/energyCostHis/index.vue

@@ -32,7 +32,6 @@ import {
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -72,7 +71,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -81,6 +80,7 @@ export default {
 			},
 			tableData: [],
 			tableProps,
+      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -137,6 +137,9 @@ export default {
 	},
 	components: {},
 	created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
 		const end = new Date();
 		const start = new Date();
 		start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);

src/views/cost/rawMaterialConfig/index.vue

@@ -12,7 +12,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:max-height="tableH"
+      :max-height="tableH"
 			:table-data="tableData">
 			<method-btn
 				v-if="tableBtn.length"
@@ -53,7 +53,6 @@ import {
 } from '@/api/cost/costMaterialSet';
 import { getHotMaterialList } from '@/api/base/coreHotMaterial';
 import { publicFormatter } from '@/utils/dict';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -92,7 +91,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -100,6 +99,7 @@ export default {
 				deleteURL: deleteCostMaterialSet,
 			},
 			tableProps,
+      tableH: this.tableHeight(260),
 			tableBtn: [
 				this.$auth.hasPermi(`cost:rawMaterialConfig:update`)
 					? {
@@ -132,11 +132,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						this.$auth.hasPermi('cost:rawMaterialConfig:create') &&
-						this.$auth.hasPermi('cost:rawMaterialConfig:query')
-							? 'separate'
-							: '',
 				},
 				{
 					type: this.$auth.hasPermi('cost:rawMaterialConfig:create')
@@ -154,6 +150,9 @@ export default {
 		AddOrUpdate,
 	},
 	created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
 		getHotMaterialList().then((response) => {
 			this.formConfig[0].selectOptions = response.data;
 		});

src/views/cost/rawMaterialCost/index.vue

@@ -32,7 +32,6 @@ import {
 import { getHotMaterialList } from '@/api/base/coreHotMaterial';
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -67,7 +66,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -76,6 +75,7 @@ export default {
 			},
 			tableData: [],
 			tableProps,
+      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -118,6 +118,9 @@ export default {
 	},
 	components: {},
 	created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
 		getHotMaterialList().then((response) => {
 			this.formConfig[0].selectOptions = response.data;
 		});

src/views/cost/rawMaterialCostHis/index.vue

@@ -32,7 +32,6 @@ import {
 import { getHotMaterialList } from '@/api/base/coreHotMaterial';
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -71,7 +70,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -80,6 +79,7 @@ export default {
 			},
 			tableData: [],
 			tableProps,
+      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -136,6 +136,9 @@ export default {
 	},
 	components: {},
 	created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
 		const end = new Date();
 		const start = new Date();
 		start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);

src/views/databoard/components/NumRateChart.vue

@@ -1,258 +1,234 @@
 <template>
-	<div style="height: 370px">
+  <div style="height: 370px;">
-		<NotMsg v-show="notMsg" />
+    <NotMsg v-show="notMsg"/>
-		<div
+    <div id="numRateChart" class="num-rate-chart" style="width:900px;height:420px;" v-show='!notMsg'></div>
-			id="numRateChart"
+  </div>
-			class="num-rate-chart"
-			style="width: 900px; height: 420px"
-			v-show="!notMsg"></div>
-	</div>
 </template>
 <script>
 import * as echarts from 'echarts';
-import resize from './../mixins/resize';
+import resize from './../mixins/resize'
-import NotMsg from './../components/NotMsg';
+import NotMsg from './../components/NotMsg'
 export default {
-	name: 'NumRateChart',
+  name: 'NumRateChart',
-	mixins: [resize],
+  mixins: [resize],
-	components: { NotMsg },
+  components:{ NotMsg },
-	data() {
+  data() {
-		return {
+    return {
-			chart: null,
+      chart: null,
-			notMsg: true,
+      notMsg:true
-		};
+    }
-	},
+  },
-	computed: {
+  computed: {
-		productline() {
+    productline() {
-			return this.$store.state.websocket.productline;
+      return this.$store.state.websocket.productline
-		},
+    }
-	},
+  },
-	watch: {
+  watch:{
-		productline: {
+    productline: {
 			handler(newVal, oldVal) {
-				if (newVal === oldVal) {
+        if (newVal === oldVal) {
-					return false;
+          return false
-				}
+        }
-				this.updateChart();
+        this.updateChart()
-				this.$emit('emitFun');
+        this.$emit('emitFun')
-			},
+			}
-		},
+		}
-	},
+  },
-	mounted() {
+  mounted() {
 		this.$el.addEventListener('resize', () => {
 			console.log('resziing.....');
 		});
-		this.updateChart();
+    this.updateChart()
 	},
-	methods: {
+  methods: {
-		updateChart() {
+    updateChart() {
-			if (this.productline && this.productline.length > 0) {
+      if (this.productline && this.productline.length > 0) {
-				this.notMsg = false;
+        this.notMsg = false
-			} else {
+      } else {
-				this.notMsg = true;
+        this.notMsg = true
-				return;
+        return
-			}
+      }
-			let xData = [];
+      let xData = []
-			let outputNum = [];
+      let outputNum = []
-			let passRate = [];
+      let passRate = []
-			for (let i = 0; i < this.productline.length - 1; i++) {
+      this.productline && this.productline.length > 0 && this.productline.map(item => {
-				// 二次循环，注意：再减去外层的循环次数，向后依次两两相互比较转换；
+        if ((item.lineName).includes('D')) {
-				for (let j = 0; j < this.productline.length - i - 1; j++) {
+          xData.push(item.lineName)
-					// 当前一个值大于后一个值
+          outputNum.push(item.outputNum)
-					if (
+          passRate.push(item.passRate?item.passRate*100:null)
-						this.productline[j].lineName.substr(
+        }
-							this.productline[j].lineName.length - 1,
+      })
-							1
+      if (
-						) >
+        this.chart !== null &&
-						this.productline[j + 1].lineName.substr(
+        this.chart !== '' &&
-							this.productline[j + 1].lineName.length - 1,
+        this.chart !== undefined
-							1
+      ) {
-						)
+        this.chart.dispose()
-					) {
+      }
-						// 定义变量，以赋值的形式前后交换，直到换到最小的在前面，左右再无比较，则循环结束形成排序结果
+      this.chart = echarts.init(document.getElementById('numRateChart'));
-						let temp = this.productline[j];
+      var option = {
-						this.productline[j] = this.productline[j + 1];
+        grid: { top: 82, right: 60, bottom: 20, left: 90 },
-						this.productline[j + 1] = temp;
+        tooltip: {
-					}
+          trigger: "axis",
-				}
+          axisPointer: {
-			}
+            type: "shadow",
-			this.productline &&
+          },
-				this.productline.length > 0 &&
+          className: "num-rate-chart-tooltip"
-				this.productline.map((item) => {
+        },
-					if (item.lineName.includes('D')) {
+        legend: {
-						xData.push(item.lineName);
+          itemWidth:10,
-						outputNum.push(item.outputNum);
+          itemHeight:10,
-						passRate.push(item.passRate);
+          top: '2.5%',
-					}
-				});
-			if (
-				this.chart !== null &&
-				this.chart !== '' &&
-				this.chart !== undefined
-			) {
-				this.chart.dispose();
-			}
-			this.chart = echarts.init(document.getElementById('numRateChart'));
-			var option = {
-				grid: { top: 82, right: 60, bottom: 20, left: 90 },
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						type: 'shadow',
-					},
-					className: 'num-rate-chart-tooltip',
-				},
-				legend: {
-					itemWidth: 10,
-					itemHeight: 10,
-					top: '2.5%',
 					right: '20px',
-					icon: 'rect',
+          icon: 'rect',
-					data: [
+          data: [
-						{ name: '产线产量', itemStyle: { color: '#364BFE' } },
+            {name:'产线产量',itemStyle:{color:'#364BFE'}},
-						{ name: '良品率', itemStyle: { color: '#FFCB59' } },
+            {name:'良品率',itemStyle:{color:'#FFCB59'}}
-					],
+          ],
-					textStyle: {
+          textStyle: {
-						color: '#DFF1FE',
+            color: "#DFF1FE",
-						fontSize: 12,
+            fontSize: 12,
-					},
+          }
-				},
+        },
-				xAxis: [
+        xAxis: [
-					{
+          {
-						type: 'category',
+            type: 'category',
-						data: xData,
+            data: xData,
-						axisLabel: {
+            axisLabel: {
-							color: '#fff',
+              color: "#fff",
-							fontSize: 12,
+              fontSize: 12,
-						},
+            },
-						axisPointer: {
+            axisPointer: {
-							type: 'shadow',
+              type: 'shadow'
-						},
+            },
-						axisTick: { show: false },
+            axisTick: { show: false },
-						axisLine: {
+            axisLine: {
-							lineStyle: {
+              lineStyle: {
-								width: 1,
+                width: 1,
-								color: '#213259',
+                color: "#213259",
-							},
+              },
-						},
+            },
-					},
+          }
-				],
+        ],
-				yAxis: [
+        yAxis: [
-					{
+          {
-						type: 'value',
+            type: 'value',
-						name: '产量/片',
+            name: '产量/片',
-						nameTextStyle: {
+            nameTextStyle: {
-							color: '#fff',
+              color: '#fff',
-							fontSize: 10,
+              fontSize: 10,
-							align: 'right',
+              align: 'right',
-						},
+            },
-						axisLabel: {
+            axisLabel: {
-							color: '#fff',
+              color: "#fff",
-							fontSize: 12,
+              fontSize: 12,
-						},
+              formatter: '{value}'
-						axisLine: {
+            },
-							show: true,
+            axisLine: {
-							lineStyle: {
+              show: true,
-								color: '#213259',
+              lineStyle: {
-							},
+                color: "#213259",
-						},
+              },
-						splitLine: {
+            },
-							lineStyle: {
+            splitLine: {
-								color: '#213259a0',
+              lineStyle: {
-							},
+                color: "#213259a0",
-						},
+              },
-					},
+            }
-					{
+          },
-						type: 'value',
+          {
-						name: '良品率',
+            type: 'value',
-						nameTextStyle: {
+            name: '良品率',
-							color: '#fff',
+            nameTextStyle: {
-							fontSize: 10,
+              color: '#fff',
-							align: 'LEFT',
+              fontSize: 10,
-						},
+              align: 'LEFT',
-						axisLabel: {
+            },
-							color: '#fff',
+            axisLabel: {
-							fontSize: 12,
+              color: "#fff",
-							formatter: '{value}%',
+              fontSize: 12,
-						},
+              formatter: () =>{
-						axisLine: {
+                return value ? '{value} %': '-'
-							show: true,
+              }
-							lineStyle: {
+            },
-								color: '#213259',
+          axisLine: {
-							},
+            show: true,
-						},
+            lineStyle: {
-						splitLine: {
+              color: "#213259",
-							lineStyle: {
+            },
-								color: '#213259a0',
+          },
-							},
+          splitLine: {
-						},
+            lineStyle: {
-					},
+              color: "#213259a0",
-				],
+            },
-				series: [
+          }
-					{
+          }
-						name: '产线产量',
+        ],
-						type: 'bar',
+        series: [
-						tooltip: {
+          {
-							valueFormatter: function (value) {
+            name: '产线产量',
-								return value;
+            type: 'bar',
-							},
+            tooltip: {
-						},
+              valueFormatter: function (value) {
-						barWidth: 20,
+                return value;
-						itemStyle: {
+              }
+            },
+            barWidth: 20,
+            itemStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: '#5CB7FF' },
+                { offset: 1, color: '#364BFE' }
+              ])
+            },
+            data: outputNum
+          },
+          {
+            name: '良品率',
+            type: 'line',
+            yAxisIndex: 1,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value?value + '%':'-';
+              }
+            },
+            itemStyle: {
+              color: '#FFD160'
+            },
+            areaStyle: {
 							color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-								{ offset: 0, color: '#5CB7FF' },
+                { offset: 0, color: '#FFCB59' + "40" },
-								{ offset: 1, color: '#364BFE' },
+                { offset: 0.5, color: '#FFCB59' + "20" },
-							]),
+                { offset: 1, color: '#FFCB59' + "00" },
-						},
+                ]),
-						data: outputNum,
+            },
-					},
+            lineStyle: {
-					{
+                width: 1
-						name: '良品率',
+            },
-						type: 'line',
+            symbol: 'circle',
-						yAxisIndex: 1,
+					  symbolSize: 5,
-						tooltip: {
+            data: passRate
-							valueFormatter: function (value) {
+          }
-								return value ? value + '%' : '-';
+        ]
-							},
+      };
-						},
+      option && this.chart.setOption(option)
-						itemStyle: {
+    }
-							color: '#FFD160',
+  }
-						},
+}
-						areaStyle: {
-							color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-								{ offset: 0, color: '#FFCB59' + '40' },
-								{ offset: 0.5, color: '#FFCB59' + '20' },
-								{ offset: 1, color: '#FFCB59' + '00' },
-							]),
-						},
-						lineStyle: {
-							width: 1,
-						},
-						symbol: 'circle',
-						symbolSize: 5,
-						data: passRate,
-					},
-				],
-			};
-			option && this.chart.setOption(option);
-		},
-	},
-};
 </script>
 <style scoped lang="scss">
 .num-rate-chart {
 	width: 100%;
 	height: 100%;
-	top: -50px;
+  top: -50px;
 }
 </style>
 <style>
-.num-rate-chart-tooltip {
+  .num-rate-chart-tooltip {
-	background: #0a2b4f77 !important;
+    background: #0a2b4f77 !important;
-	border: none !important;
+    border: none !important;
-	backdrop-filter: blur(12px);
+    backdrop-filter: blur(12px);
-}
+  }
-.num-rate-chart-tooltip * {
+  .num-rate-chart-tooltip * {
-	color: #fff !important;
+    color: #fff !important;
-}
+  }
 </style>

src/views/databoard/deepProcessing/DefectSum.vue

@@ -1,83 +1,66 @@
 <template>
-	<div style="flex: 1">
+  <div style="flex: 1;">
-		<Container
+    <Container name="各工序缺陷汇总" size="middle" style="">
-			name="各工序缺陷汇总"
+      <TimePrompt class="timeShow" :timestr="timestr" />
-			size="middle"
+      <div style="padding: 5px 10px;">
-			style="">
+        <dv-scroll-board :config="config" style="width:575px;height:380px" ref='defectScrollBoard'/>
-			<TimePrompt
+      </div>
-				class="timeShow"
+    </Container>
-				:timestr="timestr" />
+  </div>
-			<div style="padding: 5px 10px">
-				<dv-scroll-board
-					:config="config"
-					style="width: 575px; height: 380px"
-					ref="defectScrollBoard" />
-			</div>
-		</Container>
-	</div>
 </template>
 <script>
 import Container from '../components/Container.vue';
 import TimePrompt from '../components/TimePrompt';
-import { switchShowTime } from '../utils';
+import { switchShowTime } from '../utils'
 export default {
-	name: 'DefectSum',
+  name: 'DefectSum',
-	components: { Container, TimePrompt },
+  components: { Container, TimePrompt },
-	computed: {
+  computed: {
-		defectSum() {
+    defectSum() {
-			return this.$store.state.websocket.defectSum;
+      return this.$store.state.websocket.defectSum
-		},
+    }
-	},
+  },
-	data() {
+  data() {
-		return {
+    return {
-			timestr: '',
+      timestr: '',
-			config: {
+      config: {
-				header: ['序号', '产线', '工序', '损耗片数', '缺陷类型'],
+        header: ['序号', '产线', '工序','损耗片数','缺陷类型'],
-				headerBGC: 'rgba(32, 55, 96, 0.8)',
+        headerBGC: 'rgba(32, 55, 96, 0.8)',
-				oddRowBGC: 'rgba(32, 55, 96, 0.8)',
+        oddRowBGC: 'rgba(32, 55, 96, 0.8)',
-				evenRowBGC: 'rgba(14, 32, 62, 0.8)',
+        evenRowBGC: 'rgba(14, 32, 62, 0.8)',
-				columnWidth: [60],
+        columnWidth: [60],
-				align: ['center'],
+        align: ['center'],
-				data: [
+        data: [],
-					//假数据
+        // data: [[1, 'Y61', '破损','10','气泡']],
-					[1, 'D61', '成型', '3片', '细长泡'],
+        rowNum: 10
-					[2, 'D62', '组合落板', '4片', '细长泡'],
+      }
-					[3, 'D61', '磨边', '6片', '开口泡'],
+    }
-					[4, 'D63', '清洗', '5片', '结石'],
+  },
-					[5, 'D64', '打孔', '2片', '结石'],
+  mounted() {
-					[6, 'D63', '成型', '7片', '开口泡'],
+    this.timestr = switchShowTime('日')
-					[7, 'D61', '上片', '8片', '结石'],
+  },
-				],
+  watch:{
-				// data: [],
+    defectSum: {
-				rowNum: 10,
-			},
-		};
-	},
-	mounted() {
-		this.timestr = switchShowTime('日');
-	},
-	watch: {
-		defectSum: {
 			handler(newVal, oldVal) {
-				let outArr = this.defectSum.map((item, index) => [
+        let outArr = this.defectSum.map((item, index) => [
-					index + 1,
+          index+1,
-					item.productionLineName,
+          item.productionLineName,
-					item.sectionName,
+          item.sectionName,
-					item.count,
+          item.count,
-					item.inspectionTypeName,
+          item.inspectionTypeName
-				]);
+      ]);
-				this.config.data = outArr;
+        this.config.data = outArr
-				this.$refs['defectScrollBoard'].updateRows(outArr);
+        this.$refs['defectScrollBoard'].updateRows(outArr)
-				this.timestr = switchShowTime('日');
+        this.timestr = switchShowTime('日')
-			},
+			}
-		},
+		}
-	},
+  }
-};
+}
 </script>
 <style lang='scss' scoped>
 .timeShow {
-	position: absolute;
+  position: absolute;
-	top: 20px;
+  top: 20px;
-	left: 240px;
+  left: 240px;
 }
 </style>

src/views/delivery/deliveryLog/index.vue

@@ -1,324 +1,313 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
+    <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar
-			:formConfigs="formConfig"
+      :formConfigs="formConfig"
-			ref="searchBarForm"
+      ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+      @headBtnClick="buttonClick"
-		<!-- 列表 -->
+    />
-		<base-table
+    <!-- 列表 -->
-			:page="queryParams.pageNo"
+    <base-table
-			:limit="queryParams.pageSize"
+      :page="queryParams.pageNo"
-			:table-props="tableProps"
+      :limit="queryParams.pageSize"
-			:table-data="list"
+      :table-props="tableProps"
-			:max-height="tableH">
+      :table-data="list"
-			<method-btn
+      :max-height="tableH"
-				v-if="tableBtn.length"
+    >
-				slot="handleBtn"
+      <method-btn
-				:width="160"
+        v-if="tableBtn.length"
-				label="操作"
+        slot="handleBtn"
-				:method-list="tableBtn"
+        :width="160"
-				@clickBtn="handleClick" />
+        label="操作"
-		</base-table>
+        :method-list="tableBtn"
-		<pagination
+        @clickBtn="handleClick"
-			:page.sync="queryParams.pageNo"
+      />
-			:limit.sync="queryParams.pageSize"
+    </base-table>
-			:total="total"
+    <pagination
-			@pagination="getList" />
+      :page.sync="queryParams.pageNo"
-		<!-- 新增 -->
+      :limit.sync="queryParams.pageSize"
-		<base-dialog
+      :total="total"
+      @pagination="getList"
+    />
+    <!-- 新增 -->
+    <base-dialog
 			:dialogTitle="addOrEditTitle"
 			:dialogVisible="centervisible"
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			width="50%"
-			<add-or-update
+    >
-				ref="addOrUpdate"
+			<add-or-update ref="addOrUpdate" @successSubmit="successSubmit" />
-				@successSubmit="successSubmit" />
 		</base-dialog>
-		<!-- 装车 -->
+    <!-- 装车 -->
-		<base-dialog
+    <base-dialog
 			dialogTitle="装车"
 			:dialogVisible="centervisible2"
 			@cancel="handleCancel2"
 			@confirm="handleConfirm2"
 			:before-close="handleCancel2"
-			width="50%">
+			width="50%"
-			<loaded-page
+    >
-				ref="loadedPage"
+			<loaded-page ref="loadedPage" @successSubmit="successSubmit2" />
-				@successSubmit="successSubmit2" />
 		</base-dialog>
-		<!-- 发货详情 -->
+    <!-- 发货详情 -->
-		<delivery-log-detail
+    <delivery-log-detail ref='deliveryLogDetail' v-if='showDetail' />
-			ref="deliveryLogDetail"
+  </div>
-			v-if="showDetail" />
-	</div>
 </template>
 <script>
-import { parseTime } from '@/utils/ruoyi';
+import { parseTime } from '@/utils/ruoyi'
-import { deliveryLogPage, deliveryLogDelete } from '@/api/base/delivery';
+import { deliveryLogPage, deliveryLogDelete } from '@/api/base/delivery'
-import AddOrUpdate from './components/addOrUpdate';
+import AddOrUpdate from './components/addOrUpdate'
-import LoadedPage from './components/loadedPage';
+import LoadedPage from './components/loadedPage'
-import DeliveryLogDetail from './components/deliveryLogDetail.vue';
+import DeliveryLogDetail from './components/deliveryLogDetail.vue'
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'orderName',
+    prop: 'orderName',
-		label: '订单名',
+    label: '订单名',
-		minWidth: 100,
+    minWidth: 100,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'name',
+    prop: 'name',
-		label: '发货单名称',
+    label: '发货单名称',
-		minWidth: 100,
+    minWidth: 100,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'deliveryTime',
+    prop: 'deliveryTime',
-		label: '发货时间',
+    label: '发货时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'code',
+    prop: 'code',
-		label: '发货单号',
+    label: '发货单号',
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'deliverPerName',
+    prop: 'deliverPerName',
-		label: '发货负责人',
+    label: '发货负责人',
-		minWidth: 100,
+    minWidth: 100
-	},
+  },
-	{
+  {
-		prop: 'principal',
+    prop: 'principal',
-		label: '运输负责人',
+    label: '运输负责人',
-		minWidth: 100,
+    minWidth: 100
-	},
+  },
-	{
+  {
-		prop: 'principalCall',
+    prop: 'principalCall',
-		label: '运输联系方式',
+    label: '运输联系方式',
-		minWidth: 110,
+    minWidth: 110,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'principalCost',
+    prop: 'principalCost',
-		label: '运输费用',
+    label: '运输费用',
-		align: 'right',
+    align: 'right'
-	},
+  },
-	{
+  {
-		prop: 'remark',
+    prop: 'remark',
-		label: '备注',
+    label: '备注',
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  }
-];
+]
 export default {
-	name: 'DeliveryLog',
+  name: "DeliveryLog",
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '订单名',
-					label: '订单名',
+          param: 'orderName',
-					param: 'orderName',
+          defaultSelect: ''
-					defaultSelect: '',
+        },
-				},
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '发货单名称',
-					label: '发货单名称',
+          param: 'name'
-					param: 'name',
+        },
-				},
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '发货单号',
-					label: '发货单号',
+          param: 'code'
-					param: 'code',
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('extend:delivery-log:create') ? 'separate' : '',
-					type: this.$auth.hasPermi('extend:delivery-log:create')
+        },
-						? 'separate'
+        {
-						: '',
+          type: this.$auth.hasPermi('extend:delivery-log:create') ? 'button' : '',
-				},
+          btnName: '新增',
-				{
+          name: 'add',
-					type: this.$auth.hasPermi('extend:delivery-log:create')
+          color: 'success',
-						? 'button'
+          plain: true
-						: '',
+        }
-					btnName: '新增',
+      ],
-					name: 'add',
+      // 查询参数
-					color: 'success',
+      queryParams: {
-					plain: true,
+        pageNo: 1,
-				},
+        pageSize: 20,
-			],
+        orderName: '',
-			// 查询参数
+        code: '',
-			queryParams: {
+        name: ''
-				pageNo: 1,
+      },
-				pageSize: 20,
+      tableProps,
-				orderName: '',
+      list: [],
-				code: '',
+      tableH: this.tableHeight(260),
-				name: '',
+      total: 0,
-			},
+      tableBtn: [
-			tableProps,
+      this.$auth.hasPermi('extend:delivery-log:loaded')
-			list: [],
+          ? {
-			total: 0,
+              type: 'loaded',
-			tableBtn: [
+              btnName: '装车'
-				this.$auth.hasPermi('extend:delivery-log:loaded')
+            }
-					? {
+          : undefined,
-							type: 'loaded',
+      this.$auth.hasPermi('extend:delivery-log:detail')
-							btnName: '装车',
+          ? {
-					  }
+              type: 'detail',
-					: undefined,
+              btnName: '详情'
-				this.$auth.hasPermi('extend:delivery-log:detail')
+            }
-					? {
+          : undefined,
-							type: 'detail',
+        this.$auth.hasPermi('extend:delivery-log:update')
-							btnName: '详情',
+          ? {
-					  }
+              type: 'edit',
-					: undefined,
+              btnName: '编辑'
-				this.$auth.hasPermi('extend:delivery-log:update')
+            }
-					? {
+          : undefined,
-							type: 'edit',
+        this.$auth.hasPermi('extend:delivery-log:delete')
-							btnName: '编辑',
+          ? {
-					  }
+              type: 'delete',
-					: undefined,
+              btnName: '删除'
-				this.$auth.hasPermi('extend:delivery-log:delete')
+            }
-					? {
+          : undefined
-							type: 'delete',
+      ].filter((v) => v),
-							btnName: '删除',
+      addOrEditTitle: '',
-					  }
+      centervisible: false,
-					: undefined,
+      centervisible2: false,
-			].filter((v) => v),
+      showDetail: false
-			addOrEditTitle: '',
+    }
-			centervisible: false,
+  },
-			centervisible2: false,
+  created() {
-			showDetail: false,
+    window.addEventListener('resize', () => {
-		};
+      this.tableH = this.tableHeight(260)
-	},
+    })
-	created() {
+    if (location.href.indexOf('?') > 0) {
-		if (location.href.indexOf('?') > 0) {
+      let arr = location.href.split('?')[1]
-			let arr = location.href.split('?')[1];
+      this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1])
-			this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1]);
+    } else {
-		} else {
+      this.formConfig[0].defaultSelect = ''
-			this.formConfig[0].defaultSelect = '';
+    }
-		}
+    this.queryParams.orderName = this.formConfig[0].defaultSelect
-		this.queryParams.orderName = this.formConfig[0].defaultSelect;
+    this.getList();
-		this.getList();
+  },
-	},
+  components: { AddOrUpdate, LoadedPage, DeliveryLogDetail },
-	components: { AddOrUpdate, LoadedPage, DeliveryLogDetail },
+  watch: {
-	watch: {
+    $route: 'initData'
-		$route: 'initData',
+  },
-	},
+  methods: {
-	methods: {
+    initData(to) {
-		initData(to) {
+      if (to.name === 'DeliveryLog') {
-			if (to.name === 'DeliveryLog') {
+        if (location.href.indexOf('?') > 0) {
-				if (location.href.indexOf('?') > 0) {
+          let arr = location.href.split('?')[1]
-					let arr = location.href.split('?')[1];
+          this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1])
-					this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1]);
+        } else {
-				} else {
+          this.formConfig[0].defaultSelect = ''
-					this.formConfig[0].defaultSelect = '';
+        }
-				}
+        this.queryParams.orderName = this.formConfig[0].defaultSelect
-				this.queryParams.orderName = this.formConfig[0].defaultSelect;
+        this.getList()
-				this.getList();
+      }
-			}
+    },
-		},
+    getList() {
-		getList() {
+      deliveryLogPage({...this.queryParams}).then(res => {
-			deliveryLogPage({ ...this.queryParams }).then((res) => {
+        let arr = res.data.list || []
-				let arr = res.data.list || [];
+        arr && arr.map(item => {
-				arr &&
+          item.principalCost = item.principalCost.toFixed(2)
-					arr.map((item) => {
+        })
-						item.principalCost = item.principalCost.toFixed(2);
+        this.list = arr
-					});
+        this.total = res.data.total || 0
-				this.list = arr;
+      })
-				this.total = res.data.total || 0;
+    },
-			});
+    buttonClick(val) {
-		},
+      if (val.btnName === 'search') {
-		buttonClick(val) {
+        this.queryParams.name = val.name
-			if (val.btnName === 'search') {
+        this.queryParams.orderName = val.orderName
-				this.queryParams.name = val.name;
+        this.queryParams.code = val.code
-				this.queryParams.orderName = val.orderName;
+        this.getList()
-				this.queryParams.code = val.code;
+      } else {
-				this.getList();
+        this.addOrEditTitle = '新增'
-			} else {
+        this.centervisible = true
-				this.addOrEditTitle = '新增';
+        this.$nextTick(() => {
-				this.centervisible = true;
+          this.$refs.addOrUpdate.init()
-				this.$nextTick(() => {
+        })
-					this.$refs.addOrUpdate.init();
+      }
-				});
+    },
-			}
+    handleClick(val) {
-		},
+      console.log(val)
-		handleClick(val) {
+      switch (val.type) {
-			console.log(val);
+        case 'edit':
-			switch (val.type) {
+          this.addOrEditTitle = '编辑'
-				case 'edit':
+          this.centervisible = true
-					this.addOrEditTitle = '编辑';
+          this.$nextTick(() => {
-					this.centervisible = true;
+            this.$refs.addOrUpdate.init(val.data.id)
-					this.$nextTick(() => {
+          })
-						this.$refs.addOrUpdate.init(val.data.id);
+          break
-					});
+        case 'delete':
-					break;
+          this.handleDelete(val.data)
-				case 'delete':
+          break
-					this.handleDelete(val.data);
+        case 'loaded':
-					break;
+          this.centervisible2 = true
-				case 'loaded':
+          this.$nextTick(() => {
-					this.centervisible2 = true;
+            this.$refs.loadedPage.init(val.data.id, val.data.code, val.data.orderId)
-					this.$nextTick(() => {
+          })
-						this.$refs.loadedPage.init(
+          break
-							val.data.id,
+        default:
-							val.data.code,
+          this.showDetail = true
-							val.data.orderId
+          this.$nextTick(() => {
-						);
+            this.$refs.deliveryLogDetail.init(val.data)
-					});
+          })
-					break;
+      }
-				default:
+    },
-					this.showDetail = true;
+    // 新增
-					this.$nextTick(() => {
+    handleCancel() {
-						this.$refs.deliveryLogDetail.init(val.data);
+      this.$refs.addOrUpdate.formClear()
-					});
+      this.centervisible = false
-			}
+      this.addOrEditTitle = ''
-		},
+    },
-		// 新增
+    handleConfirm() {
-		handleCancel() {
+      this.$refs.addOrUpdate.submitForm()
-			this.$refs.addOrUpdate.formClear();
+    },
-			this.centervisible = false;
+    successSubmit() {
-			this.addOrEditTitle = '';
+      this.handleCancel()
-		},
+      this.getList()
-		handleConfirm() {
+    },
-			this.$refs.addOrUpdate.submitForm();
+    // 删除
-		},
+    handleDelete(val) {
-		successSubmit() {
+      this.$modal.confirm('是否确认删除发货单名为"' + val.name + '"的数据项?').then(function() {
-			this.handleCancel();
+          return deliveryLogDelete({ id: val.id })
-			this.getList();
+        }).then(() => {
-		},
+          this.getList();
-		// 删除
+          this.$modal.msgSuccess("操作成功");
-		handleDelete(val) {
+        }).catch(() => {});
-			this.$modal
+    },
-				.confirm('是否确认删除发货单名为"' + val.name + '"的数据项?')
+    // 装车
-				.then(function () {
+    handleCancel2() {
-					return deliveryLogDelete({ id: val.id });
+      this.$refs.loadedPage.formClear()
-				})
+      this.centervisible2 = false
-				.then(() => {
+    },
-					this.getList();
+    handleConfirm2() {
-					this.$modal.msgSuccess('操作成功');
+      this.$refs.loadedPage.submitForm()
-				})
+    },
-				.catch(() => {});
+    successSubmit2() {
-		},
+      this.handleCancel2()
-		// 装车
+      this.getList()
-		handleCancel2() {
+    }
-			this.$refs.loadedPage.formClear();
+  }
-			this.centervisible2 = false;
+}
-		},
-		handleConfirm2() {
-			this.$refs.loadedPage.submitForm();
-		},
-		successSubmit2() {
-			this.handleCancel2();
-			this.getList();
-		},
-	},
-};
 </script>

src/views/delivery/deliveryLogDet/index.vue

@@ -1,124 +1,130 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
+    <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar
-			:formConfigs="formConfig"
+      :formConfigs="formConfig"
-			ref="searchBarForm"
+      ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+      @headBtnClick="buttonClick"
-		<!-- 列表 -->
+    />
-		<base-table
+    <!-- 列表 -->
-			:page="queryParams.pageNo"
+    <base-table
-			:limit="queryParams.pageSize"
+      :page="queryParams.pageNo"
-			:table-props="tableProps"
+      :limit="queryParams.pageSize"
-			:table-data="list"
+      :table-props="tableProps"
-			:max-height="tableH">
+      :table-data="list"
-			<method-btn
+      :max-height="tableH"
-				v-if="tableBtn.length"
+    >
-				slot="handleBtn"
+      <method-btn
-				:width="80"
+        v-if="tableBtn.length"
-				label="操作"
+        slot="handleBtn"
-				:method-list="tableBtn"
+        :width="80"
-				@clickBtn="handleClick" />
+        label="操作"
-		</base-table>
+        :method-list="tableBtn"
-		<pagination
+        @clickBtn="handleClick"
-			:page.sync="queryParams.pageNo"
+      />
-			:limit.sync="queryParams.pageSize"
+    </base-table>
-			:total="total"
+    <pagination
-			@pagination="getList" />
+      :page.sync="queryParams.pageNo"
-		<!-- 详情抽屉 -->
+      :limit.sync="queryParams.pageSize"
-		<delivery-log-det-detail ref="deliveryLogDetail" />
+      :total="total"
-	</div>
+      @pagination="getList"
+    />
+    <!-- 详情抽屉 -->
+    <delivery-log-det-detail ref='deliveryLogDetail'/>
+  </div>
 </template>
 <script>
-import { deliveryProgressPage } from '@/api/base/delivery';
+import { deliveryProgressPage } from '@/api/base/delivery'
-import DeliveryLogDetDetail from './components/deliveryLogDetDetail.vue';
+import DeliveryLogDetDetail from './components/deliveryLogDetDetail.vue'
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'orderName',
+    prop: 'orderName',
-		label: '订单名',
+    label: '订单名',
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'customerName',
+    prop: 'customerName',
-		label: '客户名称',
+    label: '客户名称',
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'unit',
+    prop: 'unit',
-		label: '单位',
+    label: '单位'
-	},
+  },
-	{
+  {
-		prop: 'orderNum',
+    prop: 'orderNum',
-		label: '订单数量',
+    label: '订单数量'
-	},
+  },
-	{
+  {
-		prop: 'num',
+    prop: 'num',
-		label: '发货数量',
+    label: '发货数量'
-	},
+  },
-	{
+  {
-		prop: 'rate',
+    prop: 'rate',
-		label: '累计发货比例(%)',
+    label: '累计发货比例(%)'
-	},
+  }
-];
+]
 export default {
-	name: 'DeliveryLogDet',
+  name: "DeliveryLogDet",
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '订单名',
-					label: '订单名',
+          param: 'orderName'
-					param: 'orderName',
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        }
-				},
+      ],
-			],
+      // 查询参数
-			// 查询参数
+      queryParams: {
-			queryParams: {
+        pageNo: 1,
-				pageNo: 1,
+        pageSize: 20,
-				pageSize: 20,
+        orderName: ''
-				orderName: '',
+      },
-			},
+      tableProps,
-			tableProps,
+      list: [],
-			list: [],
+      tableH: this.tableHeight(260),
-			total: 0,
+      total: 0,
-			tableBtn: [
+      tableBtn: [
-				this.$auth.hasPermi('extend:delivery-log-det:detail')
+      this.$auth.hasPermi('extend:delivery-log-det:detail')
-					? {
+          ? {
-							type: 'detail',
+              type: 'detail',
-							btnName: '详情',
+              btnName: '详情'
-					  }
+            }
-					: undefined,
+          : undefined
-			].filter((v) => v),
+      ].filter((v) => v)
-		};
+    }
-	},
+  },
-	components: { DeliveryLogDetDetail },
+  components: { DeliveryLogDetDetail },
-	created() {
+  created() {
-		this.getList();
+    window.addEventListener('resize', () => {
-	},
+      this.tableH = this.tableHeight(260)
-	methods: {
+    })
-		getList() {
+    this.getList();
-			deliveryProgressPage({ ...this.queryParams }).then((res) => {
+  },
-				this.list = res.data.list || [];
+  methods: {
-				this.total = res.data.total || 0;
+    getList() {
-			});
+      deliveryProgressPage({...this.queryParams}).then(res => {
-		},
+        this.list = res.data.list || []
-		buttonClick(val) {
+        this.total = res.data.total || 0
-			this.queryParams.orderName = val.orderName;
+      })
-			this.getList();
+    },
-		},
+    buttonClick(val) {
-		handleClick(val) {
+      this.queryParams.orderName = val.orderName
-			console.log(val);
+      this.getList()
-			this.$nextTick(() => {
+    },
-				this.$refs.deliveryLogDetail.init(val.data);
+    handleClick(val) {
-			});
+      console.log(val)
-		},
+      this.$nextTick(() => {
-	},
+        this.$refs.deliveryLogDetail.init(val.data)
-};
+      })
+    }
+  }
+}
 </script>

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

@@ -187,11 +187,8 @@
 					@click="resetBtn">
 					重置
 				</el-button>
-				<span
+				<span class="separateStyle"></span>
-					class="separateStyle"
-					v-hasPermi="['analysis:contrast-analysis:export']"></span>
 				<el-button
-					v-hasPermi="['analysis:contrast-analysis:export']"
 					type="primary"
 					size="small"
 					plain

src/views/energy/analysis/qoqAnalysis/components/searchArea.vue

@@ -80,13 +80,10 @@
 			</el-button>
 		</el-form-item>
 		<el-form-item>
-			<span
+			<span class="separateStyle"></span>
-				class="separateStyle"
-				v-hasPermi="['analysis:qoq-analysis:export']"></span>
 		</el-form-item>
 		<el-form-item>
 			<el-button
-				v-hasPermi="['analysis:qoq-analysis:export']"
 				type="primary"
 				size="small"
 				@click="exportData"

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

@@ -170,11 +170,8 @@
 					@click="resetBtn">
 					重置
 				</el-button>
-				<span
+				<span class="separateStyle"></span>
-					class="separateStyle"
-					v-hasPermi="['analysis:trend-analysis:export']"></span>
 				<el-button
-					v-hasPermi="['analysis:trend-analysis:export']"
 					type="primary"
 					size="small"
 					plain

src/views/energy/analysis/yoyAnalysis/components/searchArea.vue

@@ -69,13 +69,10 @@
 			</el-button>
 		</el-form-item>
 		<el-form-item>
-			<span
+			<span class="separateStyle"></span>
-				class="separateStyle"
-				v-hasPermi="['analysis:yoy-analysis:export']"></span>
 		</el-form-item>
 		<el-form-item>
 			<el-button
-				v-hasPermi="['analysis:yoy-analysis:export']"
 				type="primary"
 				size="small"
 				@click="exportData"

src/views/energy/base/energyPlc/index.vue

@@ -1,219 +1,197 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
+
-		<search-bar
+    <!-- 搜索工作栏 -->
-			:formConfigs="formConfig"
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			ref="searchBarForm"
+    <!-- 列表 -->
-			@headBtnClick="buttonClick" />
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-		<!-- 列表 -->
+      :max-height="tableH">
-		<base-table
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
-			:page="queryParams.pageNo"
+        @clickBtn="handleClick" />
-			:limit="queryParams.pageSize"
+    </base-table>
-			:table-props="tableProps"
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-			:table-data="list"
+      @pagination="getList" />
-			:max-height="tableH">
+    <!-- 新增 -->
-			<method-btn
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
-				v-if="tableBtn.length"
+      @confirm="handleConfirm" :before-close="handleCancel">
-				slot="handleBtn"
+      <energy-plc-add ref="energyPlc" @successSubmit="successSubmit" />
-				:width="80"
+    </base-dialog>
-				label="操作"
+  </div>
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
-			@pagination="getList" />
-		<!-- 新增 -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="centervisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel">
-			<energy-plc-add
-				ref="energyPlc"
-				@successSubmit="successSubmit" />
-		</base-dialog>
-	</div>
 </template>
 
 <script>
-import { getEnergyPlcPage, deleteEnergyPlc } from '@/api/base/energyPlc';
+import { getEnergyPlcPage, deleteEnergyPlc } from "@/api/base/energyPlc";
-import EnergyPlcAdd from './components/energyPlcAdd.vue';
+// import { publicFormatter } from '@/utils/dict'
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import EnergyPlcAdd from './components/energyPlcAdd.vue'
 const tableProps = [
-	{
+  {
-		prop: 'plcTableName',
+    prop: 'plcTableName',
-		label: '关联表名',
+    label: '关联表名',
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'code',
+    prop: 'code',
-		label: '关联表编码',
+    label: '关联表编码',
-		minWidth: 150,
+    minWidth: 150,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'name',
+    prop: 'name',
-		label: '标识名',
+    label: '标识名',
-		minWidth: 150,
+    minWidth: 150,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'enName',
+    prop: 'enName',
-		label: '英文标识名',
+    label: '英文标识名'
-	},
+  },
-	{
+  {
-		prop: 'collection',
+    prop: 'collection',
-		label: '是否采集',
+    label: '是否采集'
-	},
+  },
-	{
+  {
-		prop: 'description',
+    prop: 'description',
-		label: '描述',
+    label: '描述',
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  }
-];
+]
 export default {
-	name: 'EnergyPlc',
+  name: "EnergyPlc",
-	components: { EnergyPlcAdd },
+  components: { EnergyPlcAdd },
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '标识名',
-					label: '标识名',
+          placeholder: '标识名',
-					placeholder: '标识名',
+          param: 'name'
-					param: 'name',
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        },
-				},
+        {
-				{
+          type: 'separate'
-					type: 'separate',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:energy-plc:create') ? 'button' : '',
-					type: this.$auth.hasPermi('base:energy-plc:create') ? 'button' : '',
+          btnName: '新增',
-					btnName: '新增',
+          name: 'add',
-					name: 'add',
+          color: 'success',
-					color: 'success',
+          plain: true
-					plain: true,
+        }
-				},
+      ],
-			],
+      tableProps,
-			tableProps,
+      tableBtn: [
-			tableBtn: [
+        this.$auth.hasPermi('base:energy-plc:update')
-				this.$auth.hasPermi('base:energy-plc:update')
+          ? {
-					? {
+            type: 'edit',
-							type: 'edit',
+            btnName: '编辑'
-							btnName: '编辑',
+          }
-					  }
+          : undefined,
-					: undefined,
+        this.$auth.hasPermi('base:energy-plc:delete')
-				this.$auth.hasPermi('base:energy-plc:delete')
+          ? {
-					? {
+            type: 'delete',
-							type: 'delete',
+            btnName: '删除'
-							btnName: '删除',
+          }
-					  }
+          : undefined
-					: undefined,
+      ].filter((v) => v),
-			].filter((v) => v),
+      tableH: this.tableHeight(260),
-			collectionList: [
+      collectionList: [
-				{ value: 0, label: '否' },
+        { value: 0, label: '否' },
-				{ value: 1, label: '是' },
+        { value: 1, label: '是' }
-			],
+      ],
-			// 总条数
+      // 总条数
-			total: 0,
+      total: 0,
-			// 班次基础信息列表
+      // 班次基础信息列表
-			list: [],
+      list: [],
-			// 弹出层标题
+      // 弹出层标题
-			addOrEditTitle: '',
+      addOrEditTitle: "",
-			// 是否显示弹出层
+      // 是否显示弹出层
-			centervisible: false,
+      centervisible: false,
-			// 查询参数
+      // 查询参数
-			queryParams: {
+      queryParams: {
-				pageNo: 1,
+        pageNo: 1,
-				pageSize: 20,
+        pageSize: 20,
-				name: null,
+        name: null
-			},
+      }
-		};
+    };
-	},
+  },
-	created() {
+  created() {
-		this.getList();
+    window.addEventListener('resize', () => {
-	},
+      this.tableH = this.tableHeight(260)
-	methods: {
+    })
-		buttonClick(val) {
+    this.getList();
-			switch (val.btnName) {
+  },
-				case 'search':
+  methods: {
-					this.queryParams.pageNo = 1;
+    buttonClick(val) {
-					this.queryParams.name = val.name;
+      switch (val.btnName) {
-					this.getList();
+        case 'search':
-					break;
+          this.queryParams.pageNo = 1;
-				default:
+          this.queryParams.name = val.name
-					this.addOrEditTitle = '新增';
+          this.getList()
-					this.centervisible = true;
+          break
-					this.$nextTick(() => {
+        default:
-						this.$refs.energyPlc.init();
+          this.addOrEditTitle = '新增'
-					});
+          this.centervisible = true
-			}
+          this.$nextTick(() => {
-		},
+            this.$refs.energyPlc.init()
-		/** 查询列表 */
+          })
-		getList() {
+      }
-			getEnergyPlcPage(this.queryParams).then((response) => {
+    },
-				let arr = response.data.list || [];
+    /** 查询列表 */
-				arr &&
+    getList() {
-					arr.map((item) => {
+      getEnergyPlcPage(this.queryParams).then(response => {
-						this.collectionList.map((i) => {
+        let arr = response.data.list || [];
-							if (item.collection === i.value) {
+        arr && arr.map(item => {
-								item.collection = i.label;
+          this.collectionList.map(i => {
-							}
+            if (item.collection === i.value) {
-						});
+              item.collection = i.label
-					});
+            }
-				this.list = arr;
+          })
-				this.total = response.data.total;
+        })
-			});
+        this.list = arr
-		},
+        this.total = response.data.total;
-		handleClick(val) {
+      });
-			switch (val.type) {
+    },
-				case 'edit':
+    handleClick(val) {
-					this.addOrEditTitle = '编辑';
+      switch (val.type) {
-					this.$nextTick(() => {
+        case 'edit':
-						this.$refs.energyPlc.init(val.data.id);
+          this.addOrEditTitle = '编辑'
-					});
+          this.$nextTick(() => {
-					this.centervisible = true;
+            this.$refs.energyPlc.init(val.data.id)
-					break;
+          })
-				default:
+          this.centervisible = true
-					this.handleDelete(val.data);
+          break
-			}
+        default:
-		},
+          this.handleDelete(val.data)
-		handleCancel() {
+      }
-			this.$refs.energyPlc.formClear();
+    },
-			this.centervisible = false;
+    handleCancel() {
-			this.addOrEditTitle = '';
+      this.$refs.energyPlc.formClear()
-		},
+      this.centervisible = false
-		handleConfirm() {
+      this.addOrEditTitle = ''
-			this.$refs.energyPlc.submitForm();
+    },
-		},
+    handleConfirm() {
-		successSubmit() {
+      this.$refs.energyPlc.submitForm()
-			this.handleCancel();
+    },
-			this.getList();
+    successSubmit() {
-		},
+      this.handleCancel()
-		/** 删除按钮操作 */
+      this.getList()
-		handleDelete(row) {
+    },
-			this.$modal
+    /** 删除按钮操作 */
-				.confirm('是否确认删除关联表名为"' + row.name + '"的数据项?')
+    handleDelete(row) {
-				.then(function () {
+      this.$modal.confirm('是否确认删除关联表名为"' + row.name + '"的数据项?').then(function () {
-					return deleteEnergyPlc(row.id);
+        return deleteEnergyPlc(row.id);
-				})
+      }).then(() => {
-				.then(() => {
+        this.queryParams.pageNo = 1;
-					this.queryParams.pageNo = 1;
+        this.getList();
-					this.getList();
+        this.$modal.msgSuccess("删除成功");
-					this.$modal.msgSuccess('删除成功');
+      }).catch(() => { });
-				})
+    }
-				.catch(() => {});
+  }
-		},
-	},
 };
 </script>

src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue

@@ -1,258 +1,226 @@
 <template>
-	<div>
+  <div>
-		<el-drawer
+    <el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'>
-			:title="drawerTitle"
+      <div class="box">
-			:visible.sync="visible"
+        <el-form :inline="true">
-			size="70%"
+          <el-form-item label="关联表名">
-			@close="closeD"
+            <el-input v-model="plcTableName" size='small' readonly></el-input>
-			:show-close="false">
+          </el-form-item>
-			<div class="box">
+          <el-form-item label="对象">
-				<el-form :inline="true">
+            <el-input v-model="objName" size='small' readonly></el-input>
-					<el-form-item label="关联表名">
+          </el-form-item>
-						<el-input
+          <el-form-item v-if="showBtn">
-							v-model="plcTableName"
+            <el-button type="success" size='small' plain @click="addNew">新增</el-button>
-							size="small"
+          </el-form-item>
-							readonly
+        </el-form>
-							style="width: 250px"></el-input>
+        <base-table
-					</el-form-item>
+          :page="queryParams.pageNo"
-					<el-form-item label="对象">
+          :limit="queryParams.pageSize"
-						<el-input
+          :table-props="tableProps"
-							v-model="objName"
+          :table-data="tableData"
-							size="small"
+          :max-height="tableH"
-							readonly
+        >
-							style="width: 250px"></el-input>
+          <method-btn
-					</el-form-item>
+            v-if="tableBtn.length"
-					<el-form-item v-if="showBtn">
+            slot="handleBtn"
-						<el-button
+            :width="100"
-							type="success"
+            label="操作"
-							size="small"
+            :method-list="tableBtn"
-							plain
+            @clickBtn="handleClick"
-							@click="addNew">
+          />
-							新增
+        </base-table>
-						</el-button>
+        <pagination
-					</el-form-item>
+          :page.sync="queryParams.pageNo"
-				</el-form>
+          :limit.sync="queryParams.pageSize"
-				<base-table
+          :total="total"
-					:page="queryParams.pageNo"
+          @pagination="getList"
-					:limit="queryParams.pageSize"
+        />
-					:table-props="tableProps"
+      </div>
-					:table-data="tableData"
+    </el-drawer>
-					:max-height="tableH">
+    <!-- 新增 -->
-					<method-btn
+    <base-dialog
-						v-if="tableBtn.length"
+      :dialogTitle="addOrEditTitle"
-						slot="handleBtn"
+      :dialogVisible="centervisible"
-						:width="100"
+      @cancel="handleCancel"
-						label="操作"
+      @confirm="handleConfirm"
-						:method-list="tableBtn"
+      :before-close="handleCancel"
-						@clickBtn="handleClick" />
+    >
-				</base-table>
+      <energy-plc-param-add ref="energyPlcParam" @successSubmit="successSubmit" />
-				<pagination
+    </base-dialog>
-					:page.sync="queryParams.pageNo"
+  </div>
-					:limit.sync="queryParams.pageSize"
-					:total="total"
-					@pagination="getList" />
-			</div>
-		</el-drawer>
-		<!-- 新增 -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="centervisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel">
-			<energy-plc-param-add
-				ref="energyPlcParam"
-				@successSubmit="successSubmit" />
-		</base-dialog>
-	</div>
 </template>
 <script>
-import {
+import { getEnergyPlcParamPage, deleteEnergyPlcParam } from '@/api/base/energyPlcParam'
-	getEnergyPlcParamPage,
+import EnergyPlcParamAdd from './energyPlcParamAdd'
-	deleteEnergyPlcParam,
+import { publicFormatter } from '@/utils/dict'
-} from '@/api/base/energyPlcParam';
-import EnergyPlcParamAdd from './energyPlcParamAdd';
-import { publicFormatter } from '@/utils/dict';
 const tableProps = [
-	{
+  {
-		prop: 'typeId',
+    prop: 'typeId',
-		label: '能源类型',
+    label: '能源类型'
-		filter: publicFormatter('energy_type'),
+  },
-	},
+  {
-	{
+    prop: 'plcParamName',
-		prop: 'plcParamName',
+    label: '参数列名'
-		label: '参数列名',
+  },
-	},
+  {
-	{
+    prop: 'name',
-		prop: 'name',
+    label: '参数名称'
-		label: '参数名称',
+  },
-	},
+  {
-	{
+    prop: 'unit',
-		prop: 'unit',
+    label: '单位',
-		label: '单位',
+    filter: publicFormatter('energy_unit')
-		filter: publicFormatter('unit_dict'),
+  },
-	},
+  {
-	{
+    prop: 'collection',
-		prop: 'collection',
+    label: '是否采集'
-		label: '是否采集',
+  },
-	},
+  {
-	{
+    prop: 'description',
-		prop: 'description',
+    label: '描述'
-		label: '描述',
+  }
-	},
+]
-];
 export default {
-	name: 'EnergyPlcParam',
+  name: 'EnergyPlcParam',
-	props: {
+  props: {
-		energyTypeList: {
+    energyTypeList: {
-			type: Array,
+      type: Array,
-			required: true,
+      required: true,
-			default: () => {
+      default: () => {
-				return [];
+        return []
-			},
+      }
-		},
+    }
-	},
+  },
-	data() {
+  data() {
-		return {
+    return {
-			visible: false,
+      visible: false,
-			drawerTitle: '',
+      drawerTitle: '',
-			tableProps,
+      tableProps,
-			tableData: [],
+      tableData: [],
-			tableBtn: [],
+      tableBtn: [],
-			tableH: this.tableHeight(115),
+      tableH: this.tableHeight(115),
-			total: 0,
+      total: 0,
-			queryParams: {
+      queryParams: {
-				pageNo: 1,
+        pageNo: 1,
-				pageSize: 30,
+        pageSize: 30,
-				connectId: null,
+        connectId: null
-			},
+      },
-			plcTableName: '',
+      plcTableName: '',
-			objName: '',
+      objName: '',
-			// 弹出层标题
+      // 弹出层标题
-			addOrEditTitle: '',
+      addOrEditTitle: "",
-			// 是否显示弹出层
+      // 是否显示弹出层
-			centervisible: false,
+      centervisible: false,
-			collectionList: [
+      collectionList: [
-				{ value: 0, label: '否' },
+        {value: 0,label: '否'},
-				{ value: 1, label: '是' },
+        {value: 1,label: '是'}
-			],
+      ],
-			showBtn: true,
+      showBtn: true
-		};
+    }
-	},
+  },
-	components: { EnergyPlcParamAdd },
+  components: { EnergyPlcParamAdd },
-	created() {
+  created() {
-		window.addEventListener('resize', () => {
+    window.addEventListener('resize', () => {
-			this.tableH = this.tableHeight(115);
+      this.tableH = this.tableHeight(115)
-		});
+    })
-	},
+  },
-	methods: {
+  methods: {
-		init(data, title) {
+    init(data,title) {
-			this.visible = true;
+      this.visible = true
-			this.queryParams.connectId = data.id;
+      this.queryParams.connectId = data.id
-			this.plcTableName = data.plcTableName;
+      this.plcTableName = data.plcTableName
-			this.objName = data.objName;
+      this.objName = data.objName
-			this.getList();
+      this.getList()
-			if (title === 'detail') {
+      if (title === 'detail') {
-				this.drawerTitle = '查看参数';
+        this.drawerTitle = '查看参数'
-				this.showBtn = false;
+        this.showBtn = false
-				this.tableBtn = [];
+        this.tableBtn = []
-			} else {
+      } else {
-				this.drawerTitle = '参数绑定';
+        this.drawerTitle = '参数绑定'
-				this.showBtn = true;
+        this.showBtn = true
-				this.tableBtn = [
+        this.tableBtn = [
-					{
+          {
-						type: 'edit',
+            type: 'edit',
-						btnName: '编辑',
+            btnName: '编辑'
-					},
+          },
-					{
+          {
-						type: 'delete',
+            type: 'delete',
-						btnName: '删除',
+            btnName: '删除'
-					},
+          }
-				];
+        ]
-			}
+      }
-		},
+    },
-		getList() {
+    getList() {
-			getEnergyPlcParamPage({ ...this.queryParams }).then((res) => {
+      getEnergyPlcParamPage({...this.queryParams}).then((res) => {
-				let arr = res.data.list || [];
+        let arr = res.data.list || []
-				arr &&
+        arr&&arr.map(item => {
-					arr.map((item) => {
+          this.collectionList.map(i => {
-						this.collectionList.map((i) => {
+            if (item.collection === i.value) {
-							if (item.collection === i.value) {
+              item.collection = i.label
-								item.collection = i.label;
+            }
-							}
+          })
-						});
+          this.energyTypeList.map(j => {
-						this.energyTypeList.map((j) => {
+            if (item.typeId === j.id) {
-							if (item.typeId === j.id) {
+              item.typeId = j.name
-								item.typeId = j.name;
+            }
-							}
+          })
-						});
+        })
-					});
+        this.tableData = arr
-				this.tableData = arr;
+        this.total = res.data.total;
-				this.total = res.data.total;
+      })
-			});
+    },
-		},
+    // 新增
-		// 新增
+    addNew() {
-		addNew() {
+      this.addOrEditTitle = '新增'
-			this.addOrEditTitle = '新增';
+      this.centervisible = true
-			this.centervisible = true;
+      this.$nextTick(() => {
-			this.$nextTick(() => {
+        this.$refs.energyPlcParam.init({'connectId': this.queryParams.connectId, id: ''})
-				this.$refs.energyPlcParam.init({
+      })
-					connectId: this.queryParams.connectId,
+    },
-					id: '',
+    handleCancel() {
-				});
+      this.$refs.energyPlcParam.formClear()
-			});
+      this.centervisible = false
-		},
+      this.addOrEditTitle = ''
-		handleCancel() {
+    },
-			this.$refs.energyPlcParam.formClear();
+    handleConfirm() {
-			this.centervisible = false;
+      this.$refs.energyPlcParam.submitForm()
-			this.addOrEditTitle = '';
+    },
-		},
+    successSubmit() {
-		handleConfirm() {
+      this.handleCancel()
-			this.$refs.energyPlcParam.submitForm();
+      this.getList()
-		},
+    },
-		successSubmit() {
+    handleClick(val) {
-			this.handleCancel();
+      console.log(val)
-			this.getList();
+      switch (val.type) {
-		},
+        case 'edit':
-		handleClick(val) {
+          this.addOrEditTitle = '编辑'
-			console.log(val);
+          this.centervisible = true
-			switch (val.type) {
+          this.$nextTick(() => {
-				case 'edit':
+            this.$refs.energyPlcParam.init({'connectId': this.queryParams.connectId, id: val.data.id})
-					this.addOrEditTitle = '编辑';
+          })
-					this.centervisible = true;
+          break
-					this.$nextTick(() => {
+        default:
-						this.$refs.energyPlcParam.init({
+          this.handleDelete(val.data)
-							connectId: this.queryParams.connectId,
+      }
-							id: val.data.id,
+    },
-						});
+    /** 删除按钮操作 */
-					});
+    handleDelete(row) {
-					break;
+      this.$modal.confirm('是否确认删除参数列名为"' + row.plcParamName + '"的数据项?').then(function() {
-				default:
+          return deleteEnergyPlcParam(row.id);
-					this.handleDelete(val.data);
+        }).then(() => {
-			}
+          this.queryParams.pageNo = 1;
-		},
+          this.getList();
-		/** 删除按钮操作 */
+          this.$modal.msgSuccess("删除成功");
-		handleDelete(row) {
+        }).catch(() => {});
-			this.$modal
+    },
-				.confirm('是否确认删除参数列名为"' + row.plcParamName + '"的数据项?')
+    closeD() {
-				.then(function () {
+      this.$emit('closeDrawer')
-					return deleteEnergyPlcParam(row.id);
+    }
-				})
+  }
-				.then(() => {
+}
-					this.queryParams.pageNo = 1;
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		closeD() {
-			this.$emit('closeDrawer');
-		},
-	},
-};
 </script>
 <style lang="scss" scoped>
 .box {
-	padding: 0 32px;
+  padding: 0 32px;
 }
 </style>

src/views/energy/base/energyPlcConnect/index.vue

@@ -57,18 +57,14 @@ import { getTree } from '@/api/analysis/energyAnalysis';
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import EnergyPlcConnectAdd from './components/energyPlcConnectAdd';
 import EnergyPlcParam from './components/energyPlcParam';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'objName',
 		label: '对象',
-		minWidth: 130,
-		showOverflowtooltip: true,
 	},
 	{
 		prop: 'objCode',
 		label: '对象编码',
-		minWidth: 150,
 		showOverflowtooltip: true,
 	},
 	{
@@ -90,13 +86,11 @@ const tableProps = [
 	{
 		prop: 'varNum',
 		label: '绑定参数数量',
-		width: 110,
 	},
 ];
 export default {
 	name: 'EnergyPlcConnect',
 	components: { EnergyPlcConnectAdd, EnergyPlcParam },
-	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -150,6 +144,7 @@ export default {
 					  }
 					: undefined,
 			].filter((v) => v),
+			tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
@@ -170,6 +165,9 @@ export default {
 		};
 	},
 	created() {
+		window.addEventListener('resize', () => {
+			this.tableH = this.tableHeight(260);
+		});
 		this.getList();
 	},
 	mounted() {

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

@@ -20,9 +20,9 @@
 							@change="changeSelect(scope.row, 'tableName')">
 							<el-option
 								v-for="item in tableNameList"
-								:key="item.value"
+								:key="item.id"
 								:label="item.label"
-								:value="item.value"></el-option>
+								:value="item.id"></el-option>
 						</el-select>
 					</div>
 				</template>

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

@@ -0,0 +1,38 @@
+<template>
+  <div class="tableInner">
+    <!-- <el-input v-model="list[itemProp]" @blur="changeInput" /> -->
+    <el-input-number v-model="list[itemProp]" @change="changeInput" :min="0" :max="999999999" style='width: 100%;' :controls='false' :precision='2'></el-input-number>
+  </div>
+</template>
+<script>
+export default {
+  name: 'InputArea',
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({})
+    },
+    itemProp: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      list: this.injectData
+    }
+  },
+  methods: {
+    changeInput() {
+      console.log(this.list)
+      this.$emit('emitData', this.list)
+    }
+  }
+}
+</script>
+<style scoped>
+.tableInner .el-input__inner {
+  border: none;
+  padding: 0;
+  height: 33px;
+}
+</style>

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

@@ -0,0 +1,44 @@
+<template>
+  <div class="tableInner">
+    <el-select v-model="list[itemProp]" placeholder="请选择" style="width: 100%;" @change="changeSelect">
+      <el-option
+        v-for="item in getDictDatas(DICT_TYPE.TABLE_NAME)"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value">
+      </el-option>
+    </el-select>
+  </div>
+</template>
+<script>
+export default {
+  name: 'SelectArea',
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({})
+    },
+    itemProp: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      list: this.injectData
+    }
+  },
+  methods: {
+    changeSelect() {
+      console.log(this.list)
+      this.$emit('emitData', this.list)
+    }
+  }
+}
+</script>
+<style scoped>
+.tableInner .el-input__inner {
+  border: none;
+  padding: 0;
+  height: 33px;
+}
+</style>

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

@@ -40,10 +40,18 @@
 		<el-row :gutter="20">
 			<el-col :span="24">
 				<add-table
+					:table-props="tableProps"
 					:table-data="tableData"
 					:table-name-list="tableNameList"
 					@emitFun="inputChange"
 					@emitButtonClick="emitButtonClick" />
+				<!-- <base-table
+					border
+					:table-props="tableProps"
+					:table-data="tableData"
+					:add-button-show="addButtonShow"
+					@emitFun="inputChange"
+					@emitButtonClick="emitButtonClick" /> -->
 			</el-col>
 		</el-row>
 	</el-form>
@@ -56,7 +64,21 @@ import {
 } from '@/api/base/energyQuantityManual';
 import moment from 'moment';
 import AddTable from './AddTable';
+import InputArea from './InputArea';
+import SelectArea from './SelectArea';
 import { energyTableGet } from '@/api/base/energyQuantityManual';
+const tableProps = [
+	{
+		prop: 'tableName',
+		label: '表名*',
+		subcomponent: SelectArea,
+	},
+	{
+		prop: 'readingQuantity',
+		label: '抄表数*',
+		subcomponent: InputArea,
+	},
+];
 export default {
 	name: 'EnergyQuantityManualAdd',
 	props: {
@@ -70,6 +92,7 @@ export default {
 	},
 	data() {
 		return {
+			tableProps,
 			tableData: [],
 			tableNameList: [], //表名list
 			addButtonShow: '新增',
@@ -99,7 +122,6 @@ export default {
 			} else if (params.type === 'meterReading') {
 				this.isEdit = false;
 				this.form.energyTypeId = params.energyTypeId;
-				this.selEnergyType(this.form.energyTypeId);
 				let obj = {};
 				obj.tableName = params.tableName + '';
 				obj.readingQuantity = 0;
@@ -111,7 +133,6 @@ export default {
 				energyQuantityManualGet({ id: this.form.id }).then((res) => {
 					if (res.code === 0) {
 						this.form.energyTypeId = res.data.energyTypeId;
-						this.selEnergyType(this.form.energyTypeId);
 						this.form.recordTime = res.data.recordTime
 							? res.data.recordTime
 							: null;
@@ -143,11 +164,6 @@ export default {
 			this.tableNameList = [];
 			energyTableGet({ energyTypeId: id }).then((res) => {
 				this.tableNameList = res.data.tableObjs || [];
-				if (this.tableNameList.length === 0) {
-					this.$modal.msgWarning(
-						'当前能源类型暂无配置表名，请先到《表名配置》页面配置'
-					);
-				}
 			});
 		},
 		submitForm() {

src/views/energy/base/energyQuantityManual/index.vue

@@ -52,18 +52,18 @@ import { publicFormatter } from '@/utils/dict';
 import { parseTimeTable } from '@/utils/ruoyi';
 import EnergyQuantityManualAdd from './components/energyQuantityManualAdd';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
-		prop: 'energyTypeLabel',
+		prop: 'energyType',
 		label: '能源类型',
 		minWidth: 110,
+		filter: publicFormatter('energy_type'),
 		showOverflowtooltip: true,
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-		filter: publicFormatter('unit_dict'),
+		filter: publicFormatter('energy_unit'),
 		minWidth: 110,
 	},
 	{
@@ -142,6 +142,7 @@ export default {
 				},
 			],
 			tableProps,
+			tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
@@ -180,8 +181,10 @@ export default {
 		};
 	},
 	components: { EnergyQuantityManualAdd },
-	mixins: [tableHeightMixin],
 	created() {
+		window.addEventListener('resize', () => {
+			this.tableH = this.tableHeight(260);
+		});
 		let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf();
 		let start = moment(
 			moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
@@ -241,11 +244,6 @@ export default {
 								? item.amount.toFixed(2)
 								: ''
 							: '';
-						this.getDictDatas('energy_type').map((subItem) => {
-							if (item.energyType === subItem.value) {
-								item.energyTypeLabel = subItem.label;
-							}
-						});
 					});
 				this.list = arr;
 				this.total = response.data.total;
@@ -307,7 +305,7 @@ export default {
 		handleDelete(row) {
 			console.log(row.id);
 			this.$modal
-				.confirm('是否确认删除能源类型为"' + row.energyTypeLabel + '"的数据项?')
+				.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?')
 				.then(function () {
 					return energyQuantityManualDelete({ id: row.id });
 				})

src/views/energy/base/energyQuantityRealtime/index.vue

@@ -1,254 +1,220 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
+
-		<search-bar
+    <!-- 搜索工作栏 -->
-			:formConfigs="formConfig"
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			ref="searchBarForm"
+    <!-- 列表 -->
-			@headBtnClick="buttonClick" />
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-		<!-- 列表 -->
+      :selectWidth="55" :max-height="tableH" @selection-change="selectChange" />
-		<base-table
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-			:page="queryParams.pageNo"
+      @pagination="getList" />
-			:limit="queryParams.pageSize"
+  </div>
-			:table-props="tableProps"
-			:table-data="list"
-			:selectWidth="55"
-			:max-height="tableH"
-			@selection-change="selectChange" />
-		<pagination
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
-			@pagination="getList" />
-	</div>
 </template>
 
 <script>
-import { getEnergyQuantityRealtimePage } from '@/api/base/energyQuantityRealtime';
+import { getEnergyQuantityRealtimePage } from "@/api/base/energyQuantityRealtime"
-import { getEnergyTypeListAll } from '@/api/base/energyType';
+import { getEnergyTypeListAll } from "@/api/base/energyType"
-// import { publicFormatter } from '@/utils/dict';
+// import { publicFormatter } from '@/utils/dict'
-import FileSaver from 'file-saver';
+import FileSaver from "file-saver"
-import * as XLSX from 'xlsx/xlsx.mjs';
+import * as XLSX from 'xlsx/xlsx.mjs'
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'objName',
+    prop: 'objName',
-		label: '统计对象',
+    label: '统计对象',
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'objCode',
+    prop: 'objCode',
-		label: '对象编码',
+    label: '对象编码',
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'energyTypeLabel',
+    prop: 'energyTypeName',
-		label: '能源类型',
+    label: '能源类型',
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'startValue',
+    prop: 'startValue',
-		label: '初始值',
+    label: '初始值'
-	},
+  },
-	{
+  {
-		prop: 'endValue',
+    prop: 'endValue',
-		label: '当前值',
+    label: '当前值'
-	},
+  },
-	{
+  {
-		prop: 'diffValue',
+    prop: 'diffValue',
-		label: '差值',
+    label: '差值'
-	},
+  },
-	{
+  {
-		prop: 'amount',
+    prop: 'amount',
-		label: '金额',
+    label: '金额'
-	},
+  }
-];
+]
 export default {
-	name: 'EnergyQuantityRealtime',
+  name: "EnergyQuantityRealtime",
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'select',
-					type: 'select',
+          label: '能源类型',
-					label: '能源类型',
+          selectOptions: [],
-					labelField: 'labelName',
+          param: 'energyTypeId',
-					selectOptions: [],
+          filterable: true
-					param: 'energyTypeId',
+        },
-					filterable: true,
+        {
-				},
+          type: 'datePicker',
-				{
+          label: '时间',
-					type: 'datePicker',
+          dateType: 'datetimerange',
-					label: '时间',
+          format: 'yyyy-MM-dd HH:mm:ss',
-					dateType: 'datetimerange',
+          valueFormat: "timestamp",
-					format: 'yyyy-MM-dd HH:mm:ss',
+          rangeSeparator: '-',
-					valueFormat: 'timestamp',
+          startPlaceholder: '开始时间',
-					rangeSeparator: '-',
+          endPlaceholder: '结束时间',
-					startPlaceholder: '开始时间',
+          param: 'timeVal',
-					endPlaceholder: '结束时间',
+          defaultSelect: [],
-					param: 'timeVal',
+          width: 350
-					defaultSelect: [],
+        },
-					width: 350,
+        {
-				},
+          type: 'button',
-				{
+          btnName: '查询',
-					type: 'button',
+          name: 'search',
-					btnName: '查询',
+          color: 'primary'
-					name: 'search',
+        },
-					color: 'primary',
+        {
-				},
+          type: 'separate'
-				{
+        },
-					type: 'separate',
+        {
-				},
+          type: this.$auth.hasPermi('base:energy-quantity-realtime:export') ? 'button' : '',
-				{
+          btnName: '导出',
-					type: this.$auth.hasPermi('base:energy-quantity-realtime:export')
+          name: 'export',
-						? 'button'
+          color: 'primary',
-						: '',
+          plain: true
-					btnName: '导出',
+        }
-					name: 'export',
+      ],
-					color: 'primary',
+      tableProps,
-					plain: true,
+      tableH: this.tableHeight(260),
-				},
+      // 总条数
-			],
+      total: 0,
-			tableProps,
+      // 班次基础信息列表
-			// 总条数
+      list: [],
-			total: 0,
+      // 查询参数
-			// 班次基础信息列表
+      queryParams: {
-			list: [],
+        pageNo: 1,
-			// 查询参数
+        pageSize: 20,
-			queryParams: {
+        energyTypeId: '',
-				pageNo: 1,
+        startTime: null,
-				pageSize: 20,
+        endTime: null
-				energyTypeId: '',
+      },
-				startTime: null,
+      energyTypeList: [],
-				endTime: null,
+      exportList: []
-			},
+    };
-			energyTypeList: [],
+  },
-			exportList: [],
+  created() {
-		};
+    window.addEventListener('resize', () => {
-	},
+      this.tableH = this.tableHeight(260)
-	created() {
+    })
-		if (location.href.indexOf('?') > 0) {
+    if (location.href.indexOf('?') > 0) {
-			let arr = location.href.split('?')[1].split('&');
+      let arr = location.href.split('?')[1].split('&')
-			this.formConfig[1].defaultSelect = [
+      this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
-				arr[0].split('=')[1],
+    } else {
-				arr[1].split('=')[1],
+      this.formConfig[1].defaultSelect = [Date.now() - 7 * 24 * 3600000, Date.now()]
-			];
+    }
-		} else {
+    this.queryParams.startTime = this.formConfig[1].defaultSelect[0]
-			this.formConfig[1].defaultSelect = [
+    this.queryParams.endTime = this.formConfig[1].defaultSelect[1]
-				Date.now() - 7 * 24 * 3600000,
+    this.getList();
-				Date.now(),
+    this.getTypeList()
-			];
+  },
-		}
+  watch: {
-		this.queryParams.startTime = this.formConfig[1].defaultSelect[0];
+    $route: 'initData'
-		this.queryParams.endTime = this.formConfig[1].defaultSelect[1];
+  },
-		this.getList();
+  methods: {
-		this.getTypeList();
+    initData(to) {
-	},
+      if (to.name === 'EnergyQuantityRealtime') {
-	watch: {
+        if (location.href.indexOf('?') > 0) {
-		$route: 'initData',
+          let arr = location.href.split('?')[1].split('&')
-	},
+          this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
-	methods: {
+        } else {
-		initData(to) {
+          this.formConfig[1].defaultSelect = [Date.now() - 7 * 24 * 3600000, Date.now()]
-			if (to.name === 'EnergyQuantityRealtime') {
+        }
-				if (location.href.indexOf('?') > 0) {
+        this.queryParams.startTime = this.formConfig[1].defaultSelect[0]
-					let arr = location.href.split('?')[1].split('&');
+        this.queryParams.endTime = this.formConfig[1].defaultSelect[1]
-					this.formConfig[1].defaultSelect = [
+        this.getList()
-						arr[0].split('=')[1],
+      }
-						arr[1].split('=')[1],
+    },
-					];
+    buttonClick(val) {
-				} else {
+      this.queryParams.pageNo = 1;
-					this.formConfig[1].defaultSelect = [
+      this.queryParams.energyTypeId = val.energyTypeId
-						Date.now() - 7 * 24 * 3600000,
+      this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
-						Date.now(),
+      this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
-					];
+      switch (val.btnName) {
-				}
+        case 'search':
-				this.queryParams.startTime = this.formConfig[1].defaultSelect[0];
+          this.getList()
-				this.queryParams.endTime = this.formConfig[1].defaultSelect[1];
+          break
-				this.getList();
+        default:
-			}
+          this.exportTable()
-		},
+      }
-		buttonClick(val) {
+    },
-			this.queryParams.pageNo = 1;
+    /** 查询列表 */
-			this.queryParams.energyTypeId = val.energyTypeId;
+    getList() {
-			this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
+      getEnergyQuantityRealtimePage(this.queryParams).then(response => {
-			this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
+        let arr = response.data.list || []
-			switch (val.btnName) {
+        arr && arr.map(item => {
-				case 'search':
+          item.amount = item.amount ? (!isNaN(parseFloat(item.amount)) && isFinite(item.amount) ? item.amount.toFixed(2) : '') : ''
-					this.getList();
+        })
-					break;
+        this.list = arr
-				default:
+        this.total = response.data.total;
-					this.exportTable();
+        this.exportList = []
-			}
+      });
-		},
+    },
-		/** 查询列表 */
+    getTypeList() {
-		getList() {
+      getEnergyTypeListAll().then((res) => {
-			getEnergyQuantityRealtimePage(this.queryParams).then((response) => {
+        this.formConfig[0].selectOptions = res.data || []
-				let arr = response.data.list || [];
+        this.energyTypeList = res.data || []
-				arr &&
+      })
-					arr.map((item) => {
+    },
-						item.amount = item.amount
+    selectChange(val) {
-							? !isNaN(parseFloat(item.amount)) && isFinite(item.amount)
+      console.log(val)
-								? item.amount.toFixed(2)
+      this.exportList = val
-								: ''
+    },
-							: '';
+    // 勾选导出
-						this.getDictDatas('energy_type').map((subItem) => {
+    exportTable() {
-							if (item.energyTypeName === subItem.value) {
+      if (this.exportList.length > 0) {
-								item.energyTypeLabel = subItem.label;
+        let body = this.exportList.map((x) => [
-							}
+          x.objName,
-						});
+          x.objCode,
-					});
+          x.energyTypeName,
-				this.list = arr;
+          x.startValue,
-				this.total = response.data.total;
+          x.endValue,
-				this.exportList = [];
+          x.diffValue,
-			});
+          x.amount
-		},
+        ])
-		getTypeList() {
+        let header = []
-			getEnergyTypeListAll().then((res) => {
+        this.tableProps.map((y) => {
-				this.formConfig[0].selectOptions = res.data || [];
+          header.push(y.label)
-				this.energyTypeList = res.data || [];
+        })
-			});
+        body.unshift(header)
-		},
+        console.log(body)
-		selectChange(val) {
+        const filename = '能源抄表.xlsx'
-			console.log(val);
+        const ws_name = 'Sheet1'
-			this.exportList = val;
+        const wb = XLSX.utils.book_new()
-		},
+        const ws = XLSX.utils.aoa_to_sheet(body)
-		// 勾选导出
+        XLSX.utils.book_append_sheet(wb, ws, ws_name)
-		exportTable() {
+        let wbout = XLSX.write(wb, {
-			if (this.exportList.length > 0) {
+          bookType: 'xlsx',
-				let body = this.exportList.map((x) => [
+          bookSST: false,
-					x.objName,
+          type: 'array'
-					x.objCode,
+        })
-					x.energyTypeLabel,
+        FileSaver.saveAs(
-					x.startValue,
+          new Blob([wbout], {
-					x.endValue,
+            type: 'application/octet-stream'
-					x.diffValue,
+          }),
-					x.amount,
+          filename
-				]);
+        )
-				let header = [];
+      } else {
-				this.tableProps.map((y) => {
+        this.$modal.msgWarning('请勾选需要导出的数据')
-					header.push(y.label);
+      }
-				});
+    }
-				body.unshift(header);
+  }
-				console.log(body);
-				const filename = '能源抄表.xlsx';
-				const ws_name = 'Sheet1';
-				const wb = XLSX.utils.book_new();
-				const ws = XLSX.utils.aoa_to_sheet(body);
-				XLSX.utils.book_append_sheet(wb, ws, ws_name);
-				let wbout = XLSX.write(wb, {
-					bookType: 'xlsx',
-					bookSST: false,
-					type: 'array',
-				});
-				FileSaver.saveAs(
-					new Blob([wbout], {
-						type: 'application/octet-stream',
-					}),
-					filename
-				);
-			} else {
-				this.$modal.msgWarning('请勾选需要导出的数据');
-			}
-		},
-	},
 };
 </script>

src/views/energy/base/energyType/index.vue

@@ -40,7 +40,6 @@ import { getEnergyTypePage, deleteEnergyType } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
 import InnerTable from './components/InnerTable';
 import EnergyTypeAdd from './components/energyTypeAdd';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'code',
@@ -49,8 +48,9 @@ const tableProps = [
 		minWidth: 150,
 	},
 	{
-		prop: 'energyTypeLabel',
+		prop: 'name',
 		label: '能源类型',
+		filter: publicFormatter('energy_type'),
 	},
 	{
 		prop: 'unit',
@@ -70,7 +70,6 @@ const tableProps = [
 export default {
 	name: 'EnergyType',
 	components: { EnergyTypeAdd },
-	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -97,7 +96,7 @@ export default {
 					  }
 					: undefined,
 			].filter((v) => v),
-			heightNum: 220,
+			tableH: this.tableHeight(220),
 			pricingMethodList: [
 				{ value: 0, label: '分时间段计价' },
 				{ value: 1, label: '分使用量计价' },
@@ -119,6 +118,9 @@ export default {
 		};
 	},
 	created() {
+		window.addEventListener('resize', () => {
+			this.tableH = this.tableHeight(220);
+		});
 		this.getList();
 	},
 	methods: {
@@ -140,11 +142,6 @@ export default {
 								item.pricingMethod = i.label;
 							}
 						});
-						this.getDictDatas('energy_type').map((subItem) => {
-							if (item.name === subItem.value) {
-								item.energyTypeLabel = subItem.label;
-							}
-						});
 					});
 				this.list = arr;
 				this.total = response.data.total;
@@ -177,9 +174,8 @@ export default {
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-			console.log(row);
 			this.$modal
-				.confirm('是否确认删除能源类型为"' + row.energyTypeLabel + '"的数据项?')
+				.confirm('是否确认删除能源类型为"' + row.name + '"的数据项?')
 				.then(function () {
 					return deleteEnergyType(row.id);
 				})

src/views/energy/base/tableNameConfig/index.vue

@@ -32,7 +32,6 @@
 import { energyTablePage } from '@/api/base/energyQuantityManual';
 import { publicFormatter } from '@/utils/dict';
 import tableNameConfigUpdate from './components/tableNameConfigUpdate.vue';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'energyType',
@@ -64,11 +63,10 @@ export default {
 				pageNo: 1,
 				pageSize: 100,
 			},
-			heightNum: 165,
+			tableH: this.tableHeight(165),
 			centervisible: false,
 		};
 	},
-	mixins: [tableHeightMixin],
 	created() {
 		this.getList();
 	},

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

@@ -182,7 +182,6 @@ export default {
 				limitType: '',
 				minValue: 0,
 				maxValue: 0,
-				tableName: '',
 			},
 			objIds: [], // 回显数组
 			isEdit: false, //是否是编辑
@@ -215,9 +214,6 @@ export default {
 					if (res.code === 0) {
 						this.form = res.data;
 						this.form.plcParamId = res.data.plcParamId || '';
-						this.form.tableName = this.form.tableName
-							? this.form.tableName + ''
-							: '';
 						this.form.method = this.form.method ? this.form.method + '' : '';
 						this.form.limitType = this.form.limitType
 							? this.form.limitType + ''
@@ -298,7 +294,7 @@ export default {
 		},
 		selectObj(val) {
 			this.form.objectId = val[val.length - 1];
-			this.form.objectType = val.length;
+			this.form.objectType = val.length - 1;
 			if (this.form.energyTypeId && this.form.type) {
 				this.getDetailList();
 				this.form.plcParamId = '';

src/views/energy/monitoring/energyLimit/index.vue

@@ -51,7 +51,6 @@ import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { getTree } from '@/api/analysis/energyAnalysis';
 import { publicFormatter } from '@/utils/dict';
 import EnergyLimitAdd from './components/energyLimitAdd';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'method',
@@ -105,7 +104,6 @@ const tableProps = [
 export default {
 	name: 'EnergyLimit',
 	components: { EnergyLimitAdd },
-	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -158,6 +156,7 @@ export default {
 					  }
 					: undefined,
 			].filter((v) => v),
+			tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
@@ -182,6 +181,9 @@ export default {
 		};
 	},
 	created() {
+		window.addEventListener('resize', () => {
+			this.tableH = this.tableHeight(260);
+		});
 		this.getList();
 		this.getTypeList();
 		// 获取对象树形结构

src/views/energy/monitoring/energyOverlimitLog/index.vue

@@ -45,7 +45,6 @@ import { getEnergyOverlimitLogPage } from '@/api/monitoring/energyOverlimitLog';
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
 import { parseTime } from '@/utils/ruoyi';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'objName',
@@ -124,7 +123,6 @@ const tableProps2 = [
 ];
 export default {
 	name: 'EnergyOverlimitLog',
-	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -153,10 +151,10 @@ export default {
 			activeName: 'auto',
 			tableProps,
 			tableProps2,
+			tableH: this.tableHeight(260),
 			total: 0,
 			list: [],
 			list2: [],
-			heightNum: 300,
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
@@ -172,6 +170,9 @@ export default {
 		};
 	},
 	created() {
+		window.addEventListener('resize', () => {
+			this.tableH = this.tableHeight(260);
+		});
 		this.getList();
 		this.getTypeList();
 	},

src/views/energy/monitoring/energyReport/index.vue

@@ -72,7 +72,7 @@ const tableProps = [
 	},
 ];
 export default {
-	name: 'EnergyReport',
+	name: 'EnergyLimit',
 	data() {
 		return {
 			isFold: false,
@@ -181,7 +181,7 @@ export default {
 							return energyReportPageExportAuto({ ...this.queryParams });
 						})
 						.then((response) => {
-							this.$download.excel(response, '能耗统计报表.xls');
+							this.$download.excel(response, '能源统计报表.xls');
 						})
 						.catch(() => {});
 			}

src/views/energy/monitoring/energyReportSearch/index.vue

@@ -1,171 +1,161 @@
 <template>
-	<div
+  <div class="app-container" id='energyReportSearchBox'>
-		class="app-container"
+
-		id="energyReportSearchBox">
+    <!-- 搜索工作栏 -->
-		<!-- 搜索工作栏 -->
+    <search-bar
-		<search-bar
+      :formConfigs="formConfig"
-			:formConfigs="formConfig"
+      ref="searchBarForm"
-			ref="searchBarForm"
+      :isFold="isFold"
-			:isFold="isFold"
+      @headBtnClick="buttonClick"
-			@headBtnClick="buttonClick" />
+    />
-		<!-- 列表 -->
+    <!-- 列表 -->
-		<base-table
+    <base-table
-			:page="queryParams.pageNo"
+      :page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
+      :limit="queryParams.pageSize"
-			:table-props="tableProps"
+      :table-props="tableProps"
-			:table-data="list"
+      :table-data="list"
-			:max-height="tableH" />
+      :max-height="tableH"
-		<pagination
+    />
-			:page.sync="queryParams.pageNo"
+    <pagination
-			:limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.pageNo"
-			:total="total"
+      :limit.sync="queryParams.pageSize"
-			@pagination="getList" />
+      :total="total"
-	</div>
+      @pagination="getList"
+    />
+  </div>
 </template>
 
 <script>
-import {
+import { energyReportPage, energyReportPageExport } from "@/api/monitoring/energyReport";
-	energyReportPage,
+import { getEnergyTypeListAll } from "@/api/base/energyType"
-	energyReportPageExport,
-} from '@/api/monitoring/energyReport';
-import { publicFormatter } from '@/utils/dict';
-import { getEnergyTypeListAll } from '@/api/base/energyType';
 const tableProps = [
-	{
+  {
-		prop: 'statisticName',
+    prop: 'statisticName',
-		label: '统计方案',
+    label: '统计方案'
-	},
+  },
-	{
+  {
-		prop: 'energyType',
+    prop: 'energyType',
-		label: '能源类型',
+    label: '能源类型'
-		filter: publicFormatter('energy_type'),
+  },
-	},
+  {
-	{
+    prop: 'startValue',
-		prop: 'startValue',
+    label: '抄表数(起始)'
-		label: '抄表数(起始)',
+  },
-	},
+  {
-	{
+    prop: 'endValue',
-		prop: 'endValue',
+    label: '抄表数(结束)'
-		label: '抄表数(结束)',
+  },
-	},
+  {
-	{
+    prop: 'diffValue',
-		prop: 'diffValue',
+    label: '消耗量'
-		label: '消耗量',
+  }
-	},
+]
-];
 export default {
-	name: 'EnergyReportSearch',
+  name: "EnergyReportSearch",
-	data() {
+  data() {
-		return {
+    return {
-			isFold: false,
+      isFold: false,
-			formConfig: [
+      formConfig: [
-				{
+        {
-					type: 'input',
+          type: 'input',
-					label: '统计方案',
+          label: '统计方案',
-					param: 'statisticName',
+          param: 'statisticName'
-				},
+        },
-				{
+        {
-					type: 'select',
+          type: 'select',
-					label: '能源类型',
+          label: '能源类型',
-					labelField: 'labelName',
+          selectOptions: [],
-					selectOptions: [],
+          param: 'energyTypeId',
-					param: 'energyTypeId',
+          filterable: true
-					filterable: true,
+        },
-				},
+        {
-				{
+          type: 'datePicker',
-					type: 'datePicker',
+          label: '时间',
-					label: '时间',
+          dateType: 'datetimerange',
-					dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
-					format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: "timestamp",
-					valueFormat: 'timestamp',
+          rangeSeparator: '-',
-					rangeSeparator: '-',
+          startPlaceholder: '开始时间',
-					startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
-					endPlaceholder: '结束时间',
+          param: 'timeVal',
-					param: 'timeVal',
+          defaultSelect: [],
-					defaultSelect: [],
+          width: 350,
-					width: 350,
+          clearable: false
-					clearable: false,
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        },
-				},
+        {
-				{
+          type: 'separate'
-					type: 'separate',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('monitoring:energy-report-search:export') ? 'button' : '',
-					type: this.$auth.hasPermi('monitoring:energy-report-search:export')
+          btnName: '导出',
-						? 'button'
+          name: 'add',
-						: '',
+          color: 'primary',
-					btnName: '导出',
+          plain: true
-					name: 'add',
+        }
-					color: 'primary',
+      ],
-					plain: true,
+      tableProps,
-				},
+      tableH: this.tableHeight(260),
-			],
+      // 总条数
-			tableProps,
+      total: 0,
-			tableH: this.tableHeight(260),
+      // 班次基础信息列表
-			// 总条数
+      list: [],
-			total: 0,
+      // 查询参数
-			// 班次基础信息列表
+      queryParams: {
-			list: [],
+        pageNo: 1,
-			// 查询参数
+        pageSize: 20,
-			queryParams: {
+        statisticName: null,
-				pageNo: 1,
+        startTime: null,
-				pageSize: 20,
+        endTime: null
-				statisticName: null,
+      },
-				startTime: null,
+      energyTypeList: []
-				endTime: null,
+    };
-			},
+  },
-			energyTypeList: [],
+  mounted() {
-		};
+    window.addEventListener('resize', () => {
-	},
+      this.tableH = this.tableHeight(260)
-	mounted() {
+      this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
-		window.addEventListener('resize', () => {
+    })
-			this.tableH = this.tableHeight(260);
+    this.getList()
-			this.isFold = this.searchBarWidth('energyReportSearchBox', 1180);
+    this.getTypeList()
-		});
+    this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
-		this.getList();
+  },
-		this.getTypeList();
+  methods: {
-		this.isFold = this.searchBarWidth('energyReportSearchBox', 1180);
+    getTypeList() {
-	},
+      getEnergyTypeListAll().then((res) => {
-	methods: {
+        this.formConfig[1].selectOptions = res.data || []
-		getTypeList() {
+      })
-			getEnergyTypeListAll().then((res) => {
+    },
-				this.formConfig[1].selectOptions = res.data || [];
+    buttonClick(val) {
-			});
+      switch (val.btnName) {
-		},
+        case 'search':
-		buttonClick(val) {
+          this.queryParams.pageNo = 1
-			switch (val.btnName) {
+          this.queryParams.statisticName = val.statisticName
-				case 'search':
+          this.queryParams.energyTypeId = val.energyTypeId
-					this.queryParams.pageNo = 1;
+          this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
-					this.queryParams.statisticName = val.statisticName;
+          this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
-					this.queryParams.energyTypeId = val.energyTypeId;
+          this.getList()
-					this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
+          break
-					this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
+        default:
-					this.getList();
+          this.$modal.confirm('是否确认导出').then(() => {
-					break;
+                return energyReportPageExport({...this.queryParams});
-				default:
+              }).then(response => {
-					this.$modal
+                this.$download.excel(response, '能源统计查询报表.xls');
-						.confirm('是否确认导出')
+              }).catch(() => {})
-						.then(() => {
+      }
-							return energyReportPageExport({ ...this.queryParams });
+    },
-						})
+    /** 查询列表 */
-						.then((response) => {
+    getList() {
-							this.$download.excel(response, '能源统计查询报表.xls');
+      energyReportPage({...this.queryParams}).then(response => {
-						})
+        this.list = response.data.list || [];
-						.catch(() => {});
+        this.total = response.data.total;
-			}
+      });
-		},
+    }
-		/** 查询列表 */
+  }
-		getList() {
-			energyReportPage({ ...this.queryParams }).then((response) => {
-				this.list = response.data.list || [];
-				this.total = response.data.total;
-			});
-		},
-	},
 };
 </script>

src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue

@@ -1,271 +1,230 @@
 <template>
-	<div>
+  <div>
-		<el-drawer
+    <el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'>
-			:title="drawerTitle"
+      <div class="box">
-			:visible.sync="visible"
+        <el-form :inline="true">
-			size="70%"
+          <el-form-item label="方案名称">
-			@close="closeD"
+            <el-input v-model="name" size='small' readonly></el-input>
-			:show-close="false">
+          </el-form-item>
-			<div class="box">
+          <el-form-item label="能源类型">
-				<el-form :inline="true">
+            <el-input v-model="energyType" size='small' readonly></el-input>
-					<el-form-item label="方案名称">
+          </el-form-item>
-						<el-input
+          <el-form-item>
-							v-model="name"
+            <el-button type="success" size='small' v-if="showBtn" plain @click="addNew">新增</el-button>
-							size="small"
+            <el-button type="danger" size='small' v-if="showBtn" plain @click="deleteAll">批量删除</el-button>
-							readonly></el-input>
+          </el-form-item>
-					</el-form-item>
+        </el-form>
-					<el-form-item label="能源类型">
+        <base-table
-						<el-input
+          :page="queryParams.pageNo"
-							v-model="energyTypeLabel"
+          :limit="queryParams.pageSize"
-							size="small"
+          :table-props="tableProps"
-							readonly></el-input>
+          :table-data="tableData"
-					</el-form-item>
+          :max-height="tableH"
-					<el-form-item>
+          :selectWidth="55"
-						<el-button
+          @selection-change="selectChange"
-							type="success"
+        >
-							size="small"
+          <method-btn
-							v-if="showBtn"
+            v-if="tableBtn.length"
-							plain
+            slot="handleBtn"
-							@click="addNew">
+            :width="80"
-							新增
+            label="操作"
-						</el-button>
+            :method-list="tableBtn"
-						<el-button
+            @clickBtn="handleClick"
-							type="danger"
+          />
-							size="small"
+        </base-table>
-							v-if="showBtn"
+        <pagination
-							plain
+          :page.sync="queryParams.pageNo"
-							@click="deleteAll">
+          :limit.sync="queryParams.pageSize"
-							批量删除
+          :total="total"
-						</el-button>
+          @pagination="getList"
-					</el-form-item>
+        />
-				</el-form>
+      </div>
-				<base-table
+    </el-drawer>
-					:page="queryParams.pageNo"
+    <!-- 新增 -->
-					:limit="queryParams.pageSize"
+    <energy-statistics-det-add ref="energyStatistics" @closeDet="closeDet" />
-					:table-props="tableProps"
+  </div>
-					:table-data="tableData"
-					:max-height="tableH"
-					:selectWidth="55"
-					@selection-change="selectChange">
-					<method-btn
-						v-if="tableBtn.length"
-						slot="handleBtn"
-						:width="80"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-table>
-				<pagination
-					:page.sync="queryParams.pageNo"
-					:limit.sync="queryParams.pageSize"
-					:total="total"
-					@pagination="getList" />
-			</div>
-		</el-drawer>
-		<!-- 新增 -->
-		<energy-statistics-det-add
-			ref="energyStatistics"
-			@closeDet="closeDet" />
-	</div>
 </template>
 <script>
-import {
+import { getEnergyStatisticsDetPage, deleteEnergyStatisticsDet, deleteMany } from '@/api/monitoring/energyStatisticsDet'
-	getEnergyStatisticsDetPage,
+import EnergyStatisticsDetAdd from './energyStatisticsDetAdd'
-	deleteEnergyStatisticsDet,
+import { publicFormatter } from '@/utils/dict'
-	deleteMany,
-} from '@/api/monitoring/energyStatisticsDet';
-import EnergyStatisticsDetAdd from './energyStatisticsDetAdd';
-import { publicFormatter } from '@/utils/dict';
 const tableProps = [
-	{
+  {
-		prop: 'objName',
+    prop: 'objName',
-		label: '所属对象',
+    label: '所属对象'
-	},
+  },
-	{
+  {
-		prop: 'objCode',
+    prop: 'objCode',
-		label: '对象编码',
+    label: '对象编码'
-	},
+  },
-	{
+  {
-		prop: 'paramName',
+    prop: 'paramName',
-		label: '参数名称',
+    label: '参数名称'
-	},
+  },
-	{
+  {
-		prop: 'unit',
+    prop: 'unit',
-		label: '单位',
+    label: '单位',
-		filter: publicFormatter('unit_dict'),
+    filter: publicFormatter('energy_unit')
-	},
+  },
-	{
+  {
-		prop: 'desc',
+    prop: 'desc',
-		label: '描述',
+    label: '描述'
-	},
+  }
-];
+]
 export default {
-	name: 'EnergyStatisticsDet',
+  name: 'EnergyStatisticsDet',
-	props: {
+  props: {
-		energyTypeList: {
+    energyTypeList: {
-			type: Array,
+      type: Array,
-			required: true,
+      required: true,
-			default: () => {
+      default: () => {
-				return [];
+        return []
-			},
+      }
-		},
+    }
-	},
+  },
-	data() {
+  data() {
-		return {
+    return {
-			visible: false,
+      visible: false,
-			drawerTitle: '',
+      drawerTitle: '',
-			tableProps,
+      tableProps,
-			tableData: [],
+      tableData: [],
-			tableBtn: [],
+      tableBtn: [],
-			tableH: this.tableHeight(115),
+      tableH: this.tableHeight(115),
-			total: 0,
+      total: 0,
-			queryParams: {
+      queryParams: {
-				pageNo: 1,
+        pageNo: 1,
-				pageSize: 30,
+        pageSize: 30,
-				statisticsId: null,
+        statisticsId: null
-			},
+      },
-			name: '',
+      name: '',
-			energyTypeLabel: '',
+      energyType: '',
-			energyTypeId: '',
+      energyTypeId: '',
-			// 弹出层标题
+      // 弹出层标题
-			addOrEditTitle: '',
+      addOrEditTitle: "",
-			// 是否显示弹出层
+      // 是否显示弹出层
-			centervisible: false,
+      centervisible: false,
-			collectionList: [
+      collectionList: [
-				{ value: 0, label: '否' },
+        {value: 0,label: '否'},
-				{ value: 1, label: '是' },
+        {value: 1,label: '是'}
-			],
+      ],
-			showBtn: true,
+      showBtn: true,
-			selectedList: [],
+      selectedList: []
-		};
+    }
-	},
+  },
-	components: { EnergyStatisticsDetAdd },
+  components: { EnergyStatisticsDetAdd },
-	created() {
+  created() {
-		window.addEventListener('resize', () => {
+    window.addEventListener('resize', () => {
-			this.tableH = this.tableHeight(115);
+      this.tableH = this.tableHeight(115)
-		});
+    })
-	},
+  },
-	methods: {
+  methods: {
-		init(data, title) {
+    init(data,title) {
-			this.visible = true;
+      this.visible = true
-			this.queryParams.statisticsId = data.id;
+      this.queryParams.statisticsId = data.id
-			this.name = data.name;
+      this.name = data.name
-			this.energyTypeLabel = data.energyTypeLabel;
+      this.energyType = data.energyType
-			this.energyTypeId = data.energyTypeId;
+      this.energyTypeId = data.energyTypeId
-			this.getList();
+      this.getList()
-			if (title === 'detail') {
+      if (title === 'detail') {
-				this.drawerTitle = '查看参数';
+        this.drawerTitle = '查看参数'
-				this.showBtn = false;
+        this.showBtn = false
-				this.tableBtn = [];
+        this.tableBtn = []
-			} else {
+      } else {
-				this.drawerTitle = '参数绑定';
+        this.drawerTitle = '参数绑定'
-				this.showBtn = true;
+        this.showBtn = true
-				this.tableBtn = [
+        this.tableBtn = [
-					{
+          {
-						type: 'delete',
+            type: 'delete',
-						btnName: '删除',
+            btnName: '删除'
-					},
+          }
-				];
+        ]
-			}
+      }
-		},
+    },
-		getList() {
+    getList() {
-			console.log(this.queryParams);
+      console.log(this.queryParams)
-			getEnergyStatisticsDetPage({ ...this.queryParams }).then((res) => {
+      getEnergyStatisticsDetPage({...this.queryParams}).then((res) => {
-				let arr = res.data.list || [];
+        let arr = res.data.list || []
-				arr &&
+        arr&&arr.map(item => {
-					arr.map((item) => {
+          this.collectionList.map(i => {
-						this.collectionList.map((i) => {
+            if (item.collection === i.value) {
-							if (item.collection === i.value) {
+              item.collection = i.label
-								item.collection = i.label;
+            }
-							}
+          })
-						});
+          this.energyTypeList.map(j => {
-						this.energyTypeList.map((j) => {
+            if (item.typeId === j.id) {
-							if (item.typeId === j.id) {
+              item.typeId = j.name
-								item.typeId = j.name;
+            }
-							}
+          })
-						});
+        })
-					});
+        this.tableData = arr
-				this.tableData = arr;
+        this.total = res.data.total;
-				this.total = res.data.total;
+      })
-			});
+    },
-		},
+    // 新增
-		// 新增
+    addNew() {
-		addNew() {
+      this.$nextTick(() => {
-			this.$nextTick(() => {
+        this.$refs.energyStatistics.init({'statisticsId': this.queryParams.statisticsId, energyTypeId:this.energyTypeId})
-				this.$refs.energyStatistics.init({
+      })
-					statisticsId: this.queryParams.statisticsId,
+    },
-					energyTypeId: this.energyTypeId,
+    selectChange(val) {
-				});
+      console.log(val)
-			});
+      this.selectedList = val
-		},
+    },
-		selectChange(val) {
+    // 批量删除
-			console.log(val);
+    deleteAll() {
-			this.selectedList = val;
+      let arr = []
-		},
+      if (this.selectedList.length === 0) {
-		// 批量删除
+        this.$modal.msgWarning("请选勾选数据")
-		deleteAll() {
+        return false
-			let arr = [];
+      } else {
-			if (this.selectedList.length === 0) {
+        this.selectedList.map((item) => {
-				this.$modal.msgWarning('请选勾选数据');
+          arr.push(item.id)
-				return false;
+        })
-			} else {
+      }
-				this.selectedList.map((item) => {
+      this.$modal.confirm('是否确认删除所有勾选的数据项?').then(function() {
-					arr.push(item.id);
+          return deleteMany(arr);
-				});
+        }).then(() => {
-			}
+          this.queryParams.pageNo = 1
-			this.$modal
+          this.getList()
-				.confirm('是否确认删除所有勾选的数据项?')
+          this.$modal.msgSuccess("删除成功")
-				.then(function () {
+        }).catch(() => {})
-					return deleteMany(arr);
+    },
-				})
+    handleCancel() {
-				.then(() => {
+      this.$refs.energyStatistics.formClear()
-					this.queryParams.pageNo = 1;
+      this.centervisible = false
-					this.getList();
+      this.addOrEditTitle = ''
-					this.$modal.msgSuccess('删除成功');
+    },
-				})
+    handleConfirm() {
-				.catch(() => {});
+      this.$refs.energyStatistics.submitForm()
-		},
+    },
-		handleCancel() {
+    successSubmit() {
-			this.$refs.energyStatistics.formClear();
+      this.handleCancel()
-			this.centervisible = false;
+      this.getList()
-			this.addOrEditTitle = '';
+    },
-		},
+    handleClick(val) {
-		handleConfirm() {
+      this.handleDelete(val.data)
-			this.$refs.energyStatistics.submitForm();
+    },
-		},
+    /** 删除按钮操作 */
-		successSubmit() {
+    handleDelete(row) {
-			this.handleCancel();
+      this.$modal.confirm('是否确认删除参数列名为"' + row.paramName + '"的数据项?').then(function() {
-			this.getList();
+          return deleteEnergyStatisticsDet(row.id);
-		},
+        }).then(() => {
-		handleClick(val) {
+          this.queryParams.pageNo = 1
-			this.handleDelete(val.data);
+          this.getList()
-		},
+          this.$modal.msgSuccess("删除成功")
-		/** 删除按钮操作 */
+        }).catch(() => {})
-		handleDelete(row) {
+    },
-			this.$modal
+    closeD() {
-				.confirm('是否确认删除参数列名为"' + row.paramName + '"的数据项?')
+      this.$emit('closeDrawer')
-				.then(function () {
+    },
-					return deleteEnergyStatisticsDet(row.id);
+    closeDet() {  // 关闭新增框
-				})
+      this.getList()
-				.then(() => {
+    }
-					this.queryParams.pageNo = 1;
+  }
-					this.getList();
+}
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		closeD() {
-			this.$emit('closeDrawer');
-		},
-		closeDet() {
-			// 关闭新增框
-			this.getList();
-		},
-	},
-};
 </script>
 <style lang="scss" scoped>
 .box {
-	padding: 0 32px;
+  padding: 0 32px;
 }
 </style>

src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue

@@ -1,178 +1,179 @@
 <template>
-	<el-drawer
+  <el-drawer
-		title="新增"
+    title="新增"
-		:visible.sync="centervisible"
+    :visible.sync="centervisible"
-		size="60%"
+    size="60%"
-		@close="closeA"
+    @close='closeA'
-		:show-close="false">
+    :show-close='false'>
-		<div class="box">
+    <div class="box">
-			<!-- 搜索工作栏 -->
+      <!-- 搜索工作栏 -->
-			<search-bar
+      <search-bar
-				:formConfigs="formConfig"
+        :formConfigs="formConfig"
-				ref="searchBarForm"
+        ref="searchBarForm"
-				:removeBlue="true"
+        :removeBlue='true'
-				@headBtnClick="buttonClick" />
+        @headBtnClick="buttonClick"
-			<!-- 列表 -->
+      />
-			<base-table
+      <!-- 列表 -->
-				:page="queryParams.pageNo"
+      <base-table
-				:limit="queryParams.pageSize"
+        :page="queryParams.pageNo"
-				:table-props="tableProps"
+        :limit="queryParams.pageSize"
-				:table-data="list"
+        :table-props="tableProps"
-				:max-height="tableH"
+        :table-data="list"
-				:selectWidth="55"
+        :max-height="tableH"
-				@selection-change="selectChange"></base-table>
+        :selectWidth="55"
-			<pagination
+        @selection-change="selectChange"
-				:page.sync="queryParams.pageNo"
+      >
-				:limit.sync="queryParams.pageSize"
+      </base-table>
-				:total="total"
+      <pagination
-				@pagination="getList" />
+        :page.sync="queryParams.pageNo"
-		</div>
+        :limit.sync="queryParams.pageSize"
-	</el-drawer>
+        :total="total"
+        @pagination="getList"
+      />
+    </div>
+  </el-drawer>
 </template>
 <script>
-import {
+import { addParamPage, createEnergyStatisticsDet } from '@/api/monitoring/energyStatisticsDet'
-	addParamPage,
+import { publicFormatter } from '@/utils/dict'
-	createEnergyStatisticsDet,
-} from '@/api/monitoring/energyStatisticsDet';
-import { publicFormatter } from '@/utils/dict';
 const tableProps = [
-	{
+  {
-		prop: 'objName',
+    prop: 'objName',
-		label: '所属对象',
+    label: '所属对象'
-	},
+  },
-	{
+  {
-		prop: 'objCode',
+    prop: 'objCode',
-		label: '对象编码',
+    label: '对象编码'
-	},
+  },
-	{
+  {
-		prop: 'paramName',
+    prop: 'paramName',
-		label: '参数名称',
+    label: '参数名称'
-	},
+  },
-	{
+  {
-		prop: 'unit',
+    prop: 'unit',
-		label: '单位',
+    label: '单位',
-		filter: publicFormatter('unit_dict'),
+    filter: publicFormatter('energy_unit')
-	},
+  },
-	{
+  {
-		prop: 'desc',
+    prop: 'desc',
-		label: '描述',
+    label: '描述'
-	},
+  }
-];
+]
 export default {
-	name: 'EnergyStatisticsDetAdd',
+  name: 'EnergyStatisticsDetAdd',
-	data() {
+  data() {
-		return {
+    return {
-			centervisible: false,
+      centervisible: false,
-			formConfig: [
+      formConfig: [
-				{
+        {
-					type: 'select',
+          type: 'select',
-					label: '对象类型',
+          label: '对象类型',
-					selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE),
+          selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE),
-					labelField: 'label',
+          labelField: 'label',
-					valueField: 'value',
+          valueField: 'value',
-					param: 'objType',
+          param: 'objType'
-				},
+        },
-				{
+        {
-					type: 'input',
+          type: 'input',
-					label: '参数名称',
+          label: '参数名称',
-					placeholder: '参数名称',
+          placeholder: '参数名称',
-					param: 'paramName',
+          param: 'paramName'
-				},
+        },
-				{
+        {
-					type: 'button',
+          type: 'button',
-					btnName: '查询',
+          btnName: '查询',
-					name: 'search',
+          name: 'search',
-					color: 'primary',
+          color: 'primary'
-				},
+        },
-				{
+        {
-					type: 'separate',
+          type: 'separate'
-				},
+        },
-				{
+        {
-					type: 'button',
+          type: 'button',
-					btnName: '关联',
+          btnName: '关联',
-					name: 'add',
+          name: 'add',
-					color: 'primary',
+          color: 'primary',
-					plain: true,
+          plain: true
-				},
+        }
-			],
+      ],
-			queryParams: {
+      queryParams: {
-				pageNo: 1,
+        pageNo: 1,
-				pageSize: 20,
+        pageSize: 20,
-				energyTypeId: null,
+        energyTypeId: null,
-				statisticId: null,
+        statisticId: null,
-				paramName: '',
+        paramName: '',
-				objType: '',
+        objType: ''
-			},
+      },
-			tableProps,
+      tableProps,
-			list: [],
+      list: [],
-			total: 0,
+      total: 0,
-			tableH: this.tableHeight(260),
+      tableH: this.tableHeight(260),
-			selectedList: [],
+      selectedList: []
-		};
+    }
-	},
+  },
-	methods: {
+  methods: {
-		init(param) {
+    init(param) {
-			this.queryParams.statisticId = param.statisticsId;
+      this.queryParams.statisticId = param.statisticsId
-			this.queryParams.energyTypeId = param.energyTypeId;
+      this.queryParams.energyTypeId = param.energyTypeId
-			window.addEventListener('resize', () => {
+      window.addEventListener('resize', () => {
-				this.tableH = this.tableHeight(260);
+        this.tableH = this.tableHeight(260)
-			});
+      })
-			this.centervisible = true;
+      this.centervisible = true
-			this.getList();
+      this.getList()
-		},
+    },
-		getList() {
+    getList() {
-			addParamPage({ ...this.queryParams }).then((res) => {
+      addParamPage({...this.queryParams}).then((res) => {
-				this.list = res.data.list || [];
+        this.list = res.data.list || []
-				this.total = res.data.total;
+        this.total = res.data.total
-			});
+      })
-		},
+    },
-		buttonClick(val) {
+    buttonClick(val) {
-			switch (val.btnName) {
+      switch (val.btnName) {
-				case 'search':
+        case 'search':
-					this.queryParams.pageNo = 1;
+          this.queryParams.pageNo = 1;
-					this.queryParams.objType = val.objType;
+          this.queryParams.objType = val.objType
-					this.queryParams.paramName = val.paramName;
+          this.queryParams.paramName = val.paramName
-					this.getList();
+          this.getList()
-					break;
+          break
-				default:
+        default:
-					// 关联
+          // 关联
-					this.connectParam();
+          this.connectParam()
-			}
+      }
-		},
+    },
-		// 选中数据
+    // 选中数据
-		selectChange(val) {
+    selectChange(val) {
-			this.selectedList = val;
+      this.selectedList = val
-		},
+    },
-		// 关联
+    // 关联
-		connectParam() {
+    connectParam() {
-			let param = {
+      let param = {
-				statisticsId: this.queryParams.statisticId,
+        statisticsId: this.queryParams.statisticId,
-				plcParamIds: [],
+        plcParamIds: []
-			};
+      }
-			if (this.selectedList.length === 0) {
+      if (this.selectedList.length === 0) {
-				this.$modal.msgWarning('请选勾选数据');
+        this.$modal.msgWarning("请选勾选数据")
-				return false;
+        return false
-			} else {
+      } else {
-				this.selectedList.map((item) => {
+        this.selectedList.map((item) => {
-					param.plcParamIds.push(item.id);
+          param.plcParamIds.push(item.id)
-				});
+        })
-			}
+      }
-			createEnergyStatisticsDet({ ...param }).then((res) => {
+      createEnergyStatisticsDet({...param}).then((res) => {
-				if (res.code === 0) {
+        if (res.code === 0) {
-					this.$modal.msgSuccess('操作成功');
+          this.$modal.msgSuccess("操作成功");
-					this.queryParams.pageNo = 1;
+          this.queryParams.pageNo = 1;
-					this.getList();
+          this.getList()
-				}
+        }
-			});
+      })
-		},
+    },
-		closeA() {
+    closeA() {
-			this.$emit('closeDet');
+      this.$emit('closeDet')
-		},
+    }
-	},
+  }
-};
+}
 </script>
 <style lang="scss" scoped>
 .box {
-	padding: 0 32px;
+  padding: 0 32px;
 }
 </style>

src/views/energy/monitoring/energyStatistics/index.vue

@@ -53,7 +53,6 @@ import { publicFormatter } from '@/utils/dict';
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import EnergyStatisticsAdd from './components/energyStatisticsAdd';
 import EnergyStatisticsDet from './components/energyStatisticsDet';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'name',
@@ -71,9 +70,9 @@ const tableProps = [
 		filter: publicFormatter('statistic_type'),
 	},
 	{
-		prop: 'energyTypeLabel',
+		prop: 'energyType',
 		label: '能源类型',
-		showOverflowtooltip: true,
+		filter: publicFormatter('energy_type'),
 	},
 	{
 		prop: 'paramNum',
@@ -87,7 +86,6 @@ const tableProps = [
 export default {
 	name: 'EnergyStatistics',
 	components: { EnergyStatisticsAdd, EnergyStatisticsDet },
-	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -141,6 +139,7 @@ export default {
 					  }
 					: undefined,
 			].filter((v) => v),
+			tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
@@ -159,6 +158,9 @@ export default {
 		};
 	},
 	created() {
+		window.addEventListener('resize', () => {
+			this.tableH = this.tableHeight(260);
+		});
 		this.getList();
 	},
 	mounted() {
@@ -185,13 +187,6 @@ export default {
 		getList() {
 			getEnergyStatisticsPage(this.queryParams).then((response) => {
 				let arr = response.data.list || [];
-				arr.map((item) => {
-					this.getDictDatas('energy_type').map((subItem) => {
-						if (item.energyType === subItem.value) {
-							item.energyTypeLabel = subItem.label;
-						}
-					});
-				});
 				this.list = arr;
 				this.total = response.data.total;
 			});

src/views/energy/monitoring/orderEnergy/index.vue

@@ -1,289 +1,271 @@
 <template>
-	<div class="orderEnergyContainer">
+  <div class="orderEnergyContainer">
-		<div class="box1">
+    <div class="box1">
-			<!-- 搜索工作栏 -->
+      <!-- 搜索工作栏 -->
-			<search-bar
+      <search-bar
-				:formConfigs="formConfig"
+        :formConfigs="formConfig"
-				ref="searchBarForm"
+        ref="searchBarForm"
-				@headBtnClick="buttonClick" />
+        @headBtnClick="buttonClick"
-		</div>
+      />
-		<div class="box2">
+    </div>
-			<div class="boxTitle">
+    <div class="box2">
-				<span class="blueTitle"></span>
+      <div class="boxTitle">
-				<span>工单信息</span>
+        <span class="blueTitle"></span>
-			</div>
+        <span>工单信息</span>
-			<el-row>
+      </div>
-				<el-col :span="4">
+      <el-row>
-					<div class="blodTip">工单名称</div>
+        <el-col :span='4'>
-					<div class="lightTip">{{ orderMsg.name }}</div>
+          <div class="blodTip">工单名称</div>
-				</el-col>
+          <div class="lightTip">{{ orderMsg.name }}</div>
-				<el-col :span="4">
+        </el-col>
-					<div class="blodTip">产品名称</div>
+        <el-col :span='4'>
-					<div class="lightTip">{{ orderMsg.productName }}</div>
+          <div class="blodTip">产品名称</div>
-				</el-col>
+          <div class="lightTip">{{orderMsg.productName }}</div>
-				<el-col :span="4">
+        </el-col>
-					<div class="blodTip">计划完成数量</div>
+        <el-col :span='4'>
-					<div class="lightTip">{{ orderMsg.planQuantity }}</div>
+          <div class="blodTip">计划完成数量</div>
-				</el-col>
+          <div class="lightTip">{{orderMsg.planQuantity }}</div>
-				<el-col :span="4">
+        </el-col>
-					<div class="blodTip">实际开始时间</div>
+        <el-col :span='4'>
-					<div class="lightTip">{{ parseTime(orderMsg.startProduceTime) }}</div>
+          <div class="blodTip">实际开始时间</div>
-				</el-col>
+          <div class="lightTip">{{ parseTime(orderMsg.startProduceTime) }}</div>
-				<el-col :span="4">
+        </el-col>
-					<div class="blodTip">实际完成时间</div>
+        <el-col :span='4'>
-					<div class="lightTip">
+          <div class="blodTip">实际完成时间</div>
-						{{ parseTime(orderMsg.finishProduceTime) }}
+          <div class="lightTip">{{ parseTime(orderMsg.finishProduceTime) }}</div>
-					</div>
+        </el-col>
-				</el-col>
+        <el-col :span='4'>
-				<el-col :span="4">
+          <div class="blodTip">实际加工数量</div>
-					<div class="blodTip">实际加工数量</div>
+          <div class="lightTip">{{orderMsg.actualQuantity }}</div>
-					<div class="lightTip">{{ orderMsg.actualQuantity }}</div>
+        </el-col>
-				</el-col>
+      </el-row>
-			</el-row>
+    </div>
-		</div>
+    <div class="box3">
-		<div class="box3">
+      <div class="boxTitle">
-			<div class="boxTitle">
+        <span class="blueTitle"></span>
-				<span class="blueTitle"></span>
+        <span>能耗信息</span>
-				<span>能耗信息</span>
+      </div>
-			</div>
+      <div class="toggleTabBox">
-			<div class="toggleTabBox">
+        <div :class="{ active: activeModule === 'dataList' }" @click="toggleTab('dataList')">数据列表</div>
-				<div
+        <div :class="{ active: activeModule === 'barChart' }" @click="toggleTab('barChart')">柱状图</div>
-					:class="{ active: activeModule === 'dataList' }"
+      </div>
-					@click="toggleTab('dataList')">
+      <div>
-					数据列表
+        <div  v-show="activeModule === 'dataList'">
-				</div>
+          <!-- 表格 -->
-				<div
+          <base-table
-					:class="{ active: activeModule === 'barChart' }"
+            :page="queryParams.pageNo"
-					@click="toggleTab('barChart')">
+            :limit="queryParams.pageSize"
-					柱状图
+            :table-props="tableProps"
-				</div>
+            :table-data="tableData"
-			</div>
+            :max-height="tableH"
-			<div>
+          />
-				<div v-show="activeModule === 'dataList'">
+        </div>
-					<!-- 表格 -->
+        <!-- 图形 -->
-					<base-table
+        <div v-show="activeModule === 'barChart'">
-						:page="queryParams.pageNo"
+          <bar-chart ref="orderEnergyChart" :chartData="chartData"/>
-						:limit="queryParams.pageSize"
+        </div>
-						:table-props="tableProps"
+      </div>
-						:table-data="tableData"
+    </div>
-						:max-height="tableH" />
+  </div>
-				</div>
-				<!-- 图形 -->
-				<div v-show="activeModule === 'barChart'">
-					<bar-chart
-						ref="orderEnergyChart"
-						:chartData="chartData" />
-				</div>
-			</div>
-		</div>
-	</div>
 </template>
 <script>
 const tableProps = [
-	{
+  {
-		prop: 'objName',
+    prop: 'objName',
-		label: '对象名称',
+    label: '对象名称'
-	},
+  },
-	{
+  {
-		prop: 'objCode',
+    prop: 'objCode',
-		label: '对象编码',
+    label: '对象编码'
-	},
+  },
-	{
+  {
-		prop: 'energyType',
+    prop: 'energyType',
-		label: '能源类型',
+    label: '能源类型'
-	},
+  },
-	{
+  {
-		prop: 'startNum',
+    prop: 'startNum',
-		label: '工单开始值',
+    label: '工单开始值'
-	},
+  },
-	{
+  {
-		prop: 'endNum',
+    prop: 'endNum',
-		label: '工单结束值/当前值',
+    label: '工单结束值/当前值'
-	},
+  },
-	{
+  {
-		prop: 'useNum',
+    prop: 'useNum',
-		label: '使用量',
+    label: '使用量'
-	},
+  }
-];
+]
-import { getEnergyTypeListAll } from '@/api/base/energyType';
+import { getEnergyTypeListAll } from '@/api/base/energyType'
-import { workOrderList } from '@/api/base/orderManage';
+import { workOrderList } from '@/api/base/orderManage'
-import {
+import { getWorkOrderMsg, getOrderEnergyData } from '@/api/monitoring/orderEnergy'
-	getWorkOrderMsg,
+import BarChart from "./components/barChart"
-	getOrderEnergyData,
-} from '@/api/monitoring/orderEnergy';
-import BarChart from './components/barChart';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 export default {
-	name: 'OrderEnergy',
+  name: 'OrderEnergy',
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'select',
-					type: 'select',
+          label: '工单',
-					label: '工单',
+          selectOptions: [],
-					selectOptions: [],
+          param: 'workOrderId',
-					param: 'workOrderId',
+          clearable: false
-					clearable: false,
+        },
-				},
+        {
-				{
+          type: 'select',
-					type: 'select',
+          label: '能源类型',
-					label: '能源类型',
+          selectOptions: [],
-					selectOptions: [],
+          param: 'energyTypeId',
-					param: 'energyTypeId',
+          filterable: true,
-					labelField: 'labelName',
+          width: 120,
-					filterable: true,
+          clearable: false
-					width: 120,
+        },
-					clearable: false,
+        {
-				},
+          type: 'select',
-				{
+          label: '对象维度',
-					type: 'select',
+          selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE),
-					label: '对象维度',
+          labelField: 'label',
-					selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE),
+          valueField: 'value',
-					labelField: 'label',
+          param: 'objType',
-					valueField: 'value',
+          width: 100,
-					param: 'objType',
+          clearable: false
-					width: 100,
+        },
-					clearable: false,
+        {
-				},
+          type: 'button',
-				{
+          btnName: '查询',
-					type: 'button',
+          name: 'search',
-					btnName: '查询',
+          color: 'primary'
-					name: 'search',
+        }
-					color: 'primary',
+      ],
-				},
+      tableProps,
-			],
+      tableData: [],
-			tableProps,
+      tableH: this.tableHeight(400),
-			tableData: [],
+      // 查询参数
-			heightNum: 400,
+      queryParams: {
-			// 查询参数
+        workOrderId: '',
-			queryParams: {
+        objType: '',
-				workOrderId: '',
+        energyTypeId: ''
-				objType: '',
+      },
-				energyTypeId: '',
+      orderMsg: {},
-			},
+      chartData: [],
-			orderMsg: {},
+      activeModule: 'dataList'
-			chartData: [],
+    }
-			activeModule: 'dataList',
+  },
-		};
+  components: { BarChart },
-	},
+  mounted() {
-	components: { BarChart },
+    window.addEventListener('resize', () => {
-	mounted() {
+      this.tableH = this.tableHeight(400)
-		this.getListArr();
+    })
-	},
+    this.getListArr()
-	methods: {
+  },
-		getListArr() {
+  methods: {
-			workOrderList().then((res) => {
+    getListArr() {
-				this.formConfig[0].selectOptions = res.data || [];
+      workOrderList().then(res => {
-			});
+        this.formConfig[0].selectOptions = res.data || []
-			getEnergyTypeListAll().then((res) => {
+      })
-				this.formConfig[1].selectOptions = res.data || [];
+      getEnergyTypeListAll().then(res => {
-			});
+        this.formConfig[1].selectOptions = res.data || []
-		},
+      })
-		buttonClick(val) {
+    },
-			if (!val.workOrderId) {
+    buttonClick(val) {
-				this.$modal.msgWarning('工单不能为空');
+      if (!val.workOrderId) {
-				return false;
+        this.$modal.msgWarning('工单不能为空')
-			}
+        return false
-			if (!val.energyTypeId) {
+      }
-				this.$modal.msgWarning('能源类型不能为空');
+      if (!val.energyTypeId) {
-				return false;
+        this.$modal.msgWarning('能源类型不能为空')
-			}
+        return false
-			if (!val.objType) {
+      }
-				this.$modal.msgWarning('对象维度不能为空');
+      if (!val.objType) {
-				return false;
+        this.$modal.msgWarning('对象维度不能为空')
-			}
+        return false
-			this.queryParams.workOrderId = val.workOrderId;
+      }
-			this.queryParams.objType = val.objType;
+      this.queryParams.workOrderId = val.workOrderId
-			this.queryParams.energyTypeId = val.energyTypeId;
+      this.queryParams.objType = val.objType
-			getWorkOrderMsg({ ...this.queryParams }).then((res) => {
+      this.queryParams.energyTypeId = val.energyTypeId
-				this.orderMsg = res.data || {};
+      getWorkOrderMsg({ ...this.queryParams }).then(res => {
-				getOrderEnergyData({
+        this.orderMsg = res.data || {}
-					...this.queryParams,
+        getOrderEnergyData({
-					startProduceTime: res.data.startProduceTime || '',
+          ...this.queryParams,
-					finishProduceTime: res.data.finishProduceTime || '',
+          startProduceTime: res.data.startProduceTime	 || '',
-				}).then((result) => {
+          finishProduceTime: res.data.finishProduceTime || ''
-					this.tableData = result.data || [];
+        }).then(result => {
-					this.chartData = result.data || [];
+          this.tableData = result.data || []
-				});
+          this.chartData = result.data || []
-			});
+        })
-		},
+      })
-		toggleTab(val) {
+    },
-			this.activeModule = val;
+    toggleTab(val) {
-			if (this.activeModule === 'barChart') {
+      this.activeModule = val
-				this.$nextTick((res) => {
+      if (this.activeModule === 'barChart') {
-					this.$refs.orderEnergyChart.getChart();
+        this.$nextTick((res) => {
-				});
+          this.$refs.orderEnergyChart.getChart()
-			}
+        })
-		},
+      }
-		headBtnClick() {},
+    },
-	},
+    headBtnClick() {}
-};
+  }
+}
 </script>
 <style lang='scss' scoped>
 .orderEnergyContainer {
-	background-color: rgb(242, 244, 249);
+  background-color: rgb(242, 244, 249);
-	.box1,
+  .box1, .box2, .box3 {
-	.box2,
+    background-color: #fff;
-	.box3 {
+    border-radius: 9px;
-		background-color: #fff;
+  }
-		border-radius: 9px;
+  .box1 {
-	}
+    height: 64px;
-	.box1 {
+    padding: 12px 16px 0;
-		height: 64px;
+  }
-		padding: 12px 16px 0;
+  .box2 {
-	}
+    height: 122px;
-	.box2 {
+    margin: 8px 0;
-		height: 122px;
+    padding: 16px;
-		margin: 8px 0;
+    .blodTip {
-		padding: 16px;
+      font-weight: 600;
-		.blodTip {
+      color: rgba(0,0,0,0.85);
-			font-weight: 600;
+      margin-bottom: 8px;
-			color: rgba(0, 0, 0, 0.85);
+    }
-			margin-bottom: 8px;
+    .lightTip {
-		}
+      font-weight: 400;
-		.lightTip {
+      color: rgba(102,102,102,0.75);
-			font-weight: 400;
+    }
-			color: rgba(102, 102, 102, 0.75);
+  }
-			overflow: hidden;
+  .box3 {
-			white-space: nowrap;
+    padding: 16px;
-			text-overflow: ellipsis;
+    height: calc(100vh - 330px);
-		}
+    .toggleTabBox {
-	}
+      display: inline-block;
-	.box3 {
+      div {
-		padding: 16px;
+        display: inline-block;
-		height: calc(100vh - 330px);
+        padding:0 8px 4px;
-		.toggleTabBox {
+        color: rgba(102, 102, 102, 0.5);
-			display: inline-block;
+        border-bottom: 2px solid rgba(242, 244, 249, 1);
-			div {
+        cursor: pointer;
-				display: inline-block;
+      }
-				padding: 0 8px 4px;
+      .active {
-				color: rgba(102, 102, 102, 0.5);
+        color: rgba(0,0,0,0.85);
-				border-bottom: 2px solid rgba(242, 244, 249, 1);
+        border-bottom-color: #0B58FF;
-				cursor: pointer;
+      }
-			}
+    }
-			.active {
+  }
-				color: rgba(0, 0, 0, 0.85);
+  .boxTitle {
-				border-bottom-color: #0b58ff;
+    display: inline-block;
-			}
+    font-size: 16px;
-		}
+    font-weight: 400;
-	}
+    color: #000000;
-	.boxTitle {
+    margin:0 10px 20px 0;
-		display: inline-block;
+  }
-		font-size: 16px;
+  .blueTitle {
-		font-weight: 400;
+    content: '';
-		color: #000000;
+    display: inline-block;
-		margin: 0 10px 20px 0;
+    width: 4px;
-	}
+    height: 18px;
-	.blueTitle {
+    background-color: #0B58FF;
-		content: '';
+    border-radius: 1px;
-		display: inline-block;
+    margin-right: 8px;
-		width: 4px;
+    vertical-align: bottom;
-		height: 18px;
+  }
-		background-color: #0b58ff;
-		border-radius: 1px;
-		margin-right: 8px;
-		vertical-align: bottom;
-	}
 }
 </style>

src/views/equipment/base/inspection/Confirm/index.vue

@@ -104,27 +104,21 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:inspection-confirm:create')
+					type: 'button',
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,
 					color: 'success',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:inspection-confirm:confirm')
+					type: 'button',
-						? 'button'
-						: '',
 					btnName: '批量确认',
 					name: 'batchConfirm',
 					color: 'primary',
 					plain: true,
 				},
 				{
-					type: this.$auth.hasPermi('equipment:inspection-confirm:export')
+					type: 'button',
-						? 'button'
-						: '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,

src/views/equipment/base/maintain/Confirm/index.vue

@@ -160,25 +160,21 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-confirm:create')
+					type: 'button',
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
 					plain: true,
 					color: 'success',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-confirm:confirm')
+					type: 'button',
-						? 'button'
-						: '',
 					btnName: '批量确认',
 					name: 'batchConfirm',
 					color: 'primary',
 					plain: true,
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-confirm:export')
+					type: this.$auth.hasPermi('equipment:maintain-record:export')
 						? 'button'
 						: '',
 					btnName: '导出',

src/views/equipment/base/maintain/Monitor/index.vue

@@ -193,7 +193,7 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('equipment:maintain-monitor:export')
+					type: this.$auth.hasPermi('base:quality-inspection-type:export')
 						? 'button'
 						: '',
 					btnName: '导出',

src/views/extend/processEquMaterialBom/index.vue

@@ -112,7 +112,7 @@ export default {
           param: 'code',
         },
 				{
-          type: this.$auth.hasPermi('extend:process-equ-material-bom:query') ? 'button' : '',
+					type: 'button',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',

src/views/extend/processEquValueBom/index.vue

@@ -113,7 +113,7 @@ export default {
           param: 'code',
         },
 				{
-          type: this.$auth.hasPermi('extend:process-equ-value-bom:query') ? 'button' : '',
+					type: 'button',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',

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

@@ -1,292 +1,244 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
+
-		<search-bar
+    <!-- 搜索工作栏 -->
-			:formConfigs="formConfig"
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			ref="searchBarForm"
+    <!-- 列表 -->
-			@headBtnClick="buttonClick" />
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-		<!-- 列表 -->
+      :max-height="tableH">
-		<base-table
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-			:page="queryParams.pageNo"
+        @clickBtn="handleClick" />
-			:limit="queryParams.pageSize"
+    </base-table>
-			:table-props="tableProps"
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-			:table-data="list"
+      @pagination="getList" />
-			:max-height="tableH">
+    <!-- 新增 -->
-			<method-btn
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
-				v-if="tableBtn.length"
+      @confirm="handleConfirm" :before-close="handleCancel" width='50%'>
-				slot="handleBtn"
+      <group-class-add ref="classList" @successSubmit="successSubmit" />
-				:width="120"
+    </base-dialog>
-				label="操作"
+  </div>
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
-			@pagination="getList" />
-		<!-- 新增 -->
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="centervisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="50%">
-			<group-class-add
-				ref="classList"
-				@successSubmit="successSubmit" />
-		</base-dialog>
-	</div>
 </template>
 
 <script>
-import {
+import { getGroupClassesPage, deleteGroupClasses, updateGroupClasses } from "@/api/base/groupClasses";
-	getGroupClassesPage,
+import GroupClassAdd from './components/groupClassAdd'
-	deleteGroupClasses,
+import { formatDate } from '@/utils'
-	updateGroupClasses,
+import { publicFormatter } from '@/utils/dict'
-} from '@/api/base/groupClasses';
-import GroupClassAdd from './components/groupClassAdd';
-import { formatDate } from '@/utils';
-import { publicFormatter } from '@/utils/dict';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'enableTimeStr',
+    prop: 'enableTimeStr',
-		label: '生效时段',
+    label: '生效时段',
-		minWidth: 300,
+    minWidth: 300
-	},
+  },
-	{
+  {
-		prop: 'roomNameDict',
+    prop: 'roomNameDict',
-		label: '车间名称',
+    label: '车间名称',
-		filter: publicFormatter('workshop'),
+    filter: publicFormatter('workshop'),
-		minWidth: 100,
+    minWidth: 100
-	},
+  },
-	{
+  {
-		prop: 'name',
+    prop: 'name',
-		label: '班次名称',
+    label: '班次名称'
-	},
+  },
-	{
+  {
-		prop: 'timeStr',
+    prop: 'timeStr',
-		label: '班次时间',
+    label: '班次时间',
-		minWidth: 100,
+    minWidth: 100
-	},
+  },
-	{
+  {
-		prop: 'code',
+    prop: 'code',
-		label: '班次编码',
+    label: '班次编码',
-		minWidth: 200,
+    minWidth: 200
-	},
+  },
-	{
+  {
-		prop: 'status',
+    prop: 'status',
-		label: '班次状态',
+    label: '班次状态'
-	},
+  },
-	{
+  {
-		prop: 'remark',
+    prop: 'remark',
-		label: '备注',
+    label: '备注'
-	},
+  }
-];
+]
 export default {
-	name: 'GroupClasses',
+  name: "GroupClasses",
-	components: { GroupClassAdd },
+  components: { GroupClassAdd },
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '班次名称',
-					label: '班次名称',
+          placeholder: '班次名称',
-					placeholder: '班次名称',
+          param: 'name'
-					param: 'name',
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        },
-				},
+        {
-				{
+          type: 'separate'
-					type: 'separate',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:group-classes:create') ? 'button' : '',
-					type: this.$auth.hasPermi('base:group-classes:create')
+          btnName: '新增',
-						? 'button'
+          name: 'add',
-						: '',
+          color: 'success',
-					btnName: '新增',
+          plain: true
-					name: 'add',
+        }
-					color: 'success',
+      ],
-					plain: true,
+      tableProps,
-				},
+      tableBtn: [
-			],
+        this.$auth.hasPermi('base:group-classes:cancel')
-			tableProps,
+          ? {
-			tableBtn: [
+            type: 'cancel',
-				this.$auth.hasPermi('base:group-classes:cancel')
+            btnName: '作废',
-					? {
+            showParam: {
-							type: 'cancel',
+              type: '&',
-							btnName: '作废',
+              data: [
-							showParam: {
+                {
-								type: '&',
+                  type: 'unequal',
-								data: [
+                  name: 'status',
-									{
+                  value: '不可用'
-										type: 'unequal',
+                }
-										name: 'status',
+              ]
-										value: '不可用',
+            }
-									},
+          }
-								],
+          : undefined,
-							},
+        this.$auth.hasPermi('base:group-classes:update')
-					  }
+          ? {
-					: undefined,
+            type: 'edit',
-				this.$auth.hasPermi('base:group-classes:update')
+            btnName: '编辑'
-					? {
+          }
-							type: 'edit',
+          : undefined,
-							btnName: '编辑',
+        this.$auth.hasPermi('base:group-classes:delete')
-					  }
+          ? {
-					: undefined,
+            type: 'delete',
-				this.$auth.hasPermi('base:group-classes:delete')
+            btnName: '删除'
-					? {
+          }
-							type: 'delete',
+          : undefined
-							btnName: '删除',
+      ].filter((v) => v),
-					  }
+      tableH: this.tableHeight(260),
-					: undefined,
+      // 总条数
-			].filter((v) => v),
+      total: 0,
-			// 总条数
+      // 班次基础信息列表
-			total: 0,
+      list: [],
-			// 班次基础信息列表
+      // 弹出层标题
-			list: [],
+      addOrEditTitle: "",
-			// 弹出层标题
+      // 是否显示弹出层
-			addOrEditTitle: '',
+      centervisible: false,
-			// 是否显示弹出层
+      // 查询参数
-			centervisible: false,
+      queryParams: {
-			// 查询参数
+        pageNo: 1,
-			queryParams: {
+        pageSize: 20,
-				pageNo: 1,
+        name: null
-				pageSize: 20,
+      }
-				name: null,
+    };
-			},
+  },
-		};
+  created() {
-	},
+    window.addEventListener('resize', () => {
-	created() {
+      this.tableH = this.tableHeight(260)
-		this.getList();
+    })
-	},
+    this.getList()
-	methods: {
+  },
-		buttonClick(val) {
+  methods: {
-			switch (val.btnName) {
+    buttonClick(val) {
-				case 'search':
+      switch (val.btnName) {
-					this.queryParams.pageNo = 1;
+        case 'search':
-					this.queryParams.name = val.name;
+          this.queryParams.pageNo = 1;
-					this.getList();
+          this.queryParams.name = val.name
-					break;
+          this.getList()
-				default:
+          break
-					this.addOrEditTitle = '新增';
+        default:
-					this.centervisible = true;
+          this.addOrEditTitle = '新增'
-					this.$nextTick(() => {
+          this.centervisible = true
-						this.$refs.classList.init();
+          this.$nextTick(() => {
-					});
+            this.$refs.classList.init()
-			}
+          })
-		},
+      }
-		/** 查询列表 */
+    },
-		getList() {
+    /** 查询列表 */
-			getGroupClassesPage(this.queryParams).then((res) => {
+    getList() {
-				if (res.code === 0 && res.data.list.length > 0) {
+      getGroupClassesPage(this.queryParams).then(res => {
-					res.data.list.map((item) => {
+        if (res.code === 0 && res.data.list.length > 0) {
-						item.enableTimeStr =
+          res.data.list.map(item => {
-							formatDate(item.enableTime) +
+            item.enableTimeStr = formatDate(item.enableTime) + '至' + (item.disableTime ? formatDate(item.disableTime) : '永久')
-							'至' +
+            item.timeStr = item.startTime.slice(0, 5) + '-' + item.endTime.slice(0, 5)
-							(item.disableTime ? formatDate(item.disableTime) : '永久');
+            item.status = item.status === true ? '可用' : '不可用'
-						item.timeStr =
+          })
-							item.startTime.slice(0, 5) + '-' + item.endTime.slice(0, 5);
+          this.list = res.data.list;
-						item.status = item.status === true ? '可用' : '不可用';
+          this.total = res.data.total;
-					});
+        } else {
-					this.list = res.data.list;
+          this.list = []
-					this.total = res.data.total;
+          this.total = 0
-				} else {
+        }
-					this.list = [];
+      });
-					this.total = 0;
+    },
-				}
+    handleClick(val) {
-			});
+      switch (val.type) {
-		},
+        case 'edit':
-		handleClick(val) {
+          this.addOrEditTitle = '编辑'
-			switch (val.type) {
+          this.$nextTick(() => {
-				case 'edit':
+            this.$refs.classList.init(val.data.id)
-					this.addOrEditTitle = '编辑';
+          })
-					this.$nextTick(() => {
+          this.centervisible = true
-						this.$refs.classList.init(val.data.id);
+          break
-					});
+        case 'cancel':
-					this.centervisible = true;
+          this.discard(val.data)
-					break;
+          break
-				case 'cancel':
+        default:
-					this.discard(val.data);
+          this.handleDelete(val.data)
-					break;
+      }
-				default:
+    },
-					this.handleDelete(val.data);
+    handleCancel() {
-			}
+      this.$refs.classList.formClear()
-		},
+      this.centervisible = false
-		handleCancel() {
+      this.addOrEditTitle = ''
-			this.$refs.classList.formClear();
+    },
-			this.centervisible = false;
+    handleConfirm() {
-			this.addOrEditTitle = '';
+      this.$refs.classList.submitForm()
-		},
+    },
-		handleConfirm() {
+    successSubmit() {
-			this.$refs.classList.submitForm();
+      this.handleCancel()
-		},
+      this.getList()
-		successSubmit() {
+    },
-			this.handleCancel();
+    discard(row) {
-			this.getList();
+      let obj = {}
-		},
+      obj.id = row.id
-		discard(row) {
+      obj.startTime = row.startTime
-			let obj = {};
+      obj.endTime = row.endTime
-			obj.id = row.id;
+      obj.enableTime = row.enableTime
-			obj.startTime = row.startTime;
+      obj.disableTime = Date.parse(new Date())
-			obj.endTime = row.endTime;
+      this.$modal.confirm('是否确认作废班次名称为"' + row.name + '"的数据项?').then(function () {
-			obj.enableTime = row.enableTime;
+        return updateGroupClasses({ ...obj })
-			obj.disableTime = Date.parse(new Date());
+      }).then(() => {
-			this.$modal
+        this.getList();
-				.confirm('是否确认作废班次名称为"' + row.name + '"的数据项?')
+        this.$modal.msgSuccess("操作成功");
-				.then(function () {
+      }).catch(() => { });
-					return updateGroupClasses({ ...obj });
+    },
-				})
+    /** 删除按钮操作 */
-				.then(() => {
+    handleDelete(row) {
-					this.getList();
+      console.log(row)
-					this.$modal.msgSuccess('操作成功');
+      let _this = this
-				})
+      if (row.status === '可用') {// 可用
-				.catch(() => {});
+        _this.$modal.confirm('删除的班次"' + row.name + '"可能会影响交接班计划，请点取消再次确认！').then(function () {
-		},
+          return _this.$modal.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?').then(function () {
-		/** 删除按钮操作 */
+            return deleteGroupClasses(row.id);
-		handleDelete(row) {
+          }).then(() => {
-			console.log(row);
+            _this.getList();
-			let _this = this;
+            _this.$modal.msgSuccess("删除成功");
-			if (row.status === '可用') {
+          }).catch(() => { });
-				// 可用
+        })
-				_this.$modal
+      } else {
-					.confirm(
+        _this.$modal.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?').then(function () {
-						'删除的班次"' +
+          return deleteGroupClasses(row.id);
-							row.name +
+        }).then(() => {
-							'"可能会影响交接班计划，请点取消再次确认！'
+          _this.getList();
-					)
+          _this.$modal.msgSuccess("删除成功");
-					.then(function () {
+        }).catch(() => { });
-						return _this.$modal
+      }
-							.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?')
+    }
-							.then(function () {
+  }
-								return deleteGroupClasses(row.id);
-							})
-							.then(() => {
-								_this.getList();
-								_this.$modal.msgSuccess('删除成功');
-							})
-							.catch(() => {});
-					});
-			} else {
-				_this.$modal
-					.confirm('是否确认删除班次名称为"' + row.name + '"的数据项?')
-					.then(function () {
-						return deleteGroupClasses(row.id);
-					})
-					.then(() => {
-						_this.getList();
-						_this.$modal.msgSuccess('删除成功');
-					})
-					.catch(() => {});
-			}
-		},
-	},
 };
 </script>

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

@@ -1,260 +1,253 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
+
-		<search-bar
+    <!-- 搜索工作栏 -->
-			:formConfigs="formConfig"
+    <search-bar
-			ref="searchBarForm"
+      :formConfigs="formConfig"
-			@headBtnClick="buttonClick" />
+      ref="searchBarForm"
-		<!-- 列表 -->
+      @headBtnClick="buttonClick"
-		<base-table
+    />
-			:page="queryParams.pageNo"
+    <!-- 列表 -->
-			:limit="queryParams.pageSize"
+    <base-table
-			:table-props="tableProps"
+      :page="queryParams.pageNo"
-			:table-data="list"
+      :limit="queryParams.pageSize"
-			:max-height="tableH"
+      :table-props="tableProps"
-			@emitFun="handleTableEvents">
+      :table-data="list"
-			<method-btn
+      :max-height="tableH"
-				v-if="tableBtn.length"
+      @emitFun="handleTableEvents"
-				slot="handleBtn"
+    >
-				:width="80"
+      <method-btn
-				label="操作"
+        v-if="tableBtn.length"
-				:method-list="tableBtn"
+        slot="handleBtn"
-				@clickBtn="handleClick" />
+        :width="80"
-		</base-table>
+        label="操作"
-		<pagination
+        :method-list="tableBtn"
-			:page.sync="queryParams.pageNo"
+        @clickBtn="handleClick"
-			:limit.sync="queryParams.pageSize"
+      />
-			:total="total"
+    </base-table>
-			@pagination="getList" />
+    <pagination
-		<!-- 新增 -->
+      :page.sync="queryParams.pageNo"
-		<base-dialog
+      :limit.sync="queryParams.pageSize"
-			:dialogTitle="addOrEditTitle"
+      :total="total"
-			:dialogVisible="centervisible"
+      @pagination="getList"
-			@cancel="handleCancel"
+    />
-			@confirm="handleConfirm"
+    <!-- 新增 -->
-			:before-close="handleCancel"
+    <base-dialog
-			width="40%">
+      :dialogTitle="addOrEditTitle"
-			<group-team-add
+      :dialogVisible="centervisible"
-				ref="groupList"
+      @cancel="handleCancel"
-				@successSubmit="successSubmit" />
+      @confirm="handleConfirm"
-		</base-dialog>
+      :before-close="handleCancel"
-		<!-- 组员编辑 -->
+      width='40%'
-		<worker-edit
+    >
-			v-if="paramVisible"
+      <group-team-add ref="groupList" @successSubmit="successSubmit" />
-			ref="workerEditParam"
+    </base-dialog>
-			@closeDrawer="closeDrawer"></worker-edit>
+    <!-- 组员编辑 -->
-	</div>
+    <worker-edit v-if='paramVisible' ref='workerEditParam' @closeDrawer="closeDrawer"></worker-edit>
+  </div>
 </template>
 
 <script>
-import {
+import { getGroupTeamPage, deleteGroupTeam, updateGroupTeam } from "@/api/base/groupTeam";
-	getGroupTeamPage,
+import { parseTime } from '@/utils/ruoyi'
-	deleteGroupTeam,
+import GroupTeamAdd from './components/groupTeamAdd'
-	updateGroupTeam,
+import StatusBtn from './components/statusBtn'
-} from '@/api/base/groupTeam';
+import WorkerOperate from './components/workerOperate'
-import { parseTime } from '@/utils/ruoyi';
+import WorkerEdit from './components/workerEdit'
-import GroupTeamAdd from './components/groupTeamAdd';
+import { publicFormatter } from '@/utils/dict'
-import StatusBtn from './components/statusBtn';
-import WorkerOperate from './components/workerOperate';
-import WorkerEdit from './components/workerEdit';
-import { publicFormatter } from '@/utils/dict';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'createTime',
+    prop: 'createTime',
-		label: '创建时间',
+    label: '创建时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'roomNameDict',
+    prop: 'roomNameDict',
-		label: '车间名称',
+    label: '车间名称',
-		filter: publicFormatter('workshop'),
+    filter: publicFormatter('workshop')
-	},
+  },
-	{
+  {
-		prop: 'name',
+    prop: 'name',
-		label: '班组名称',
+    label: '班组名称'
-	},
+  },
-	{
+  {
-		prop: 'code',
+    prop: 'code',
-		label: '编码',
+    label: '编码',
-		minWidth: 220,
+    minWidth: 220
-	},
+  },
-	{
+  {
-		prop: 'num',
+    prop: 'num',
-		label: '班组人数',
+    label: '班组人数'
-	},
+  },
-	{
+  {
-		prop: 'leaderName',
+    prop: 'leaderName',
-		label: '组长',
+    label: '组长'
-	},
+  },
-	{
+  {
-		prop: 'enabled',
+    prop: 'enabled',
-		label: '班组状态',
+    label: '班组状态',
-		subcomponent: StatusBtn,
+    subcomponent: StatusBtn
-	},
+  },
-	{
+  {
-		prop: 'workerName',
+    prop: 'workerName',
-		label: '组员',
+    label: '组员',
-		subcomponent: WorkerOperate,
+    subcomponent: WorkerOperate
-	},
+  },
-];
+]
 export default {
-	name: 'GroupTeam',
+  name: "GroupTeam",
-	components: { GroupTeamAdd, WorkerEdit },
+  components: { GroupTeamAdd, WorkerEdit },
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '班组名称',
-					label: '班组名称',
+          placeholder: '班组名称',
-					placeholder: '班组名称',
+          param: 'name'
-					param: 'name',
+        },
-				},
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '组长',
-					label: '组长',
+          placeholder: '组长',
-					placeholder: '组长',
+          param: 'leaderName'
-					param: 'leaderName',
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        },
-				},
+        {
-				{
+          type: 'separate'
-					type: 'separate',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:group-team:create') ? 'button' : '',
-					type: this.$auth.hasPermi('base:group-team:create') ? 'button' : '',
+          btnName: '新增',
-					btnName: '新增',
+          name: 'add',
-					name: 'add',
+          color: 'success',
-					color: 'success',
+          plain: true
-					plain: true,
+        }
-				},
+      ],
-			],
+      tableProps,
-			tableProps,
+      tableBtn: [
-			tableBtn: [
+        this.$auth.hasPermi('base:group-team:update')
-				this.$auth.hasPermi('base:group-team:update')
+          ? {
-					? {
+              type: 'edit',
-							type: 'edit',
+              btnName: '编辑'
-							btnName: '编辑',
+            }
-					  }
+          : undefined,
-					: undefined,
+        this.$auth.hasPermi('base:group-team:delete')
-				this.$auth.hasPermi('base:group-team:delete')
+          ? {
-					? {
+              type: 'delete',
-							type: 'delete',
+              btnName: '删除'
-							btnName: '删除',
+            }
-					  }
+          : undefined
-					: undefined,
+      ].filter((v) => v),
-			].filter((v) => v),
+      tableH: this.tableHeight(260),
-			// 总条数
+      // 总条数
-			total: 0,
+      total: 0,
-			// 班次基础信息列表
+      // 班次基础信息列表
-			list: [],
+      list: [],
-			// 弹出层标题
+      // 弹出层标题
-			addOrEditTitle: '',
+      addOrEditTitle: "",
-			// 是否显示弹出层
+      // 是否显示弹出层
-			centervisible: false,
+      centervisible: false,
-			// 查询参数
+      // 查询参数
-			queryParams: {
+      queryParams: {
-				pageNo: 1,
+        pageNo: 1,
-				pageSize: 20,
+        pageSize: 20,
-				name: null,
+        name: null,
-				code: null,
+        code: null
-			},
+      },
-			paramVisible: false,
+      paramVisible: false
-		};
+    };
-	},
+  },
-	created() {
+  created() {
-		this.getList();
+    window.addEventListener('resize', () => {
-	},
+      this.tableH = this.tableHeight(260)
-	methods: {
+    })
-		buttonClick(val) {
+    this.getList();
-			switch (val.btnName) {
+  },
-				case 'search':
+  methods: {
-					this.queryParams.pageNo = 1;
+    buttonClick(val) {
-					this.queryParams.leaderName = val.leaderName;
+      switch (val.btnName) {
-					this.queryParams.name = val.name;
+        case 'search':
-					this.getList();
+          this.queryParams.pageNo = 1;
-					break;
+          this.queryParams.leaderName = val.leaderName
-				default:
+          this.queryParams.name = val.name
-					this.addOrEditTitle = '新增';
+          this.getList()
-					this.centervisible = true;
+          break
-					this.$nextTick(() => {
+        default:
-						this.$refs.groupList.init();
+          this.addOrEditTitle = '新增'
-					});
+          this.centervisible = true
-			}
+          this.$nextTick(() => {
-		},
+            this.$refs.groupList.init()
-		/** 查询列表 */
+          })
-		getList() {
+      }
-			getGroupTeamPage(this.queryParams).then((response) => {
+    },
-				this.list = response.data.list;
+    /** 查询列表 */
-				this.total = response.data.total;
+    getList() {
-			});
+      getGroupTeamPage(this.queryParams).then(response => {
-		},
+        this.list = response.data.list;
-		handleClick(val) {
+        this.total = response.data.total;
-			switch (val.type) {
+      });
-				case 'edit':
+    },
-					this.addOrEditTitle = '编辑';
+    handleClick(val) {
-					this.$nextTick(() => {
+      switch (val.type) {
-						this.$refs.groupList.init(val.data.id);
+        case 'edit':
-					});
+          this.addOrEditTitle = '编辑'
-					this.centervisible = true;
+          this.$nextTick(() => {
-					break;
+            this.$refs.groupList.init(val.data.id)
-				default:
+          })
-					this.handleDelete(val.data);
+          this.centervisible = true
-			}
+          break
-		},
+        default:
-		// 班组状态
+        this.handleDelete(val.data)
-		handleTableEvents(params) {
+      }
-			console.log(params);
+    },
-			if (params.name === 'state') {
+    // 班组状态
-				// 班组状态
+    handleTableEvents(params) {
-				updateGroupTeam({ ...params.payload }).then((res) => {
+      console.log(params)
-					if (res.code === 0) {
+      if (params.name === 'state') {// 班组状态
-						this.$modal.msgSuccess('操作成功');
+        updateGroupTeam({ ...params.payload }).then((res) => {
-					}
+          if (res.code === 0) {
-				});
+            this.$modal.msgSuccess("操作成功");
-			} else {
+          }
-				// 编辑&查看
+        })
-				this.paramVisible = true;
+      }else {// 编辑&查看
-				this.$nextTick(() => {
+        this.paramVisible = true
-					this.$refs.workerEditParam.init(params);
+        this.$nextTick(() => {
-				});
+          this.$refs.workerEditParam.init(params)
-			}
+        })
-		},
+      }
-		handleCancel() {
+    },
-			this.$refs.groupList.formClear();
+    handleCancel() {
-			this.centervisible = false;
+      this.$refs.groupList.formClear()
-			this.addOrEditTitle = '';
+      this.centervisible = false
-		},
+      this.addOrEditTitle = ''
-		handleConfirm() {
+    },
-			this.$refs.groupList.submitForm();
+    handleConfirm() {
-		},
+      this.$refs.groupList.submitForm()
-		successSubmit() {
+    },
-			this.handleCancel();
+    successSubmit() {
-			this.getList();
+      this.handleCancel()
-		},
+      this.getList()
-		/** 删除按钮操作 */
+    },
-		handleDelete(row) {
+    /** 删除按钮操作 */
-			this.$modal
+    handleDelete(row) {
-				.confirm('是否确认删除班组名称为"' + row.name + '"的数据项?')
+      this.$modal.confirm('是否确认删除班组名称为"' + row.name + '"的数据项?').then(function() {
-				.then(function () {
+          return deleteGroupTeam(row.id);
-					return deleteGroupTeam(row.id);
+        }).then(() => {
-				})
+          this.queryParams.pageNo = 1;
-				.then(() => {
+          this.getList();
-					this.queryParams.pageNo = 1;
+          this.$modal.msgSuccess("删除成功");
-					this.getList();
+        }).catch(() => {});
-					this.$modal.msgSuccess('删除成功');
+    },
-				})
+    closeDrawer() {
-				.catch(() => {});
+      this.getList()
-		},
+    }
-		closeDrawer() {
+  }
-			this.getList();
-		},
-	},
 };
 </script>

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

@@ -1,150 +1,152 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
+    <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar
-			:formConfigs="formConfig"
+      :formConfigs="formConfig"
-			ref="searchBarForm"
+      ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+      @headBtnClick="buttonClick"
-		<!-- 列表 -->
+    />
-		<base-table
+    <!-- 列表 -->
-			:page="queryParams.pageNo"
+    <base-table
-			:limit="queryParams.pageSize"
+      :page="queryParams.pageNo"
-			:table-props="tableProps"
+      :limit="queryParams.pageSize"
-			:table-data="list"
+      :table-props="tableProps"
-			:max-height="tableH">
+      :table-data="list"
-			<method-btn
+      :max-height="tableH"
-				v-if="tableBtn.length"
+    >
-				slot="handleBtn"
+      <method-btn
-				:width="160"
+        v-if="tableBtn.length"
-				label="操作"
+        slot="handleBtn"
-				:method-list="tableBtn"
+        :width="160"
-				@clickBtn="handleClick" />
+        label="操作"
-		</base-table>
+        :method-list="tableBtn"
-		<!-- 查看详情 -->
+        @clickBtn="handleClick"
-		<group-team-view-detail
+      />
-			v-if="paramVisible"
+    </base-table>
-			ref="groupTeamViewDetail" />
+    <!-- 查看详情 -->
-	</div>
+    <group-team-view-detail v-if="paramVisible" ref="groupTeamViewDetail"/>
+  </div>
 </template>
 <script>
-import { getByWorkOrder } from '@/api/monitoring/groupTeamView';
+import { getByWorkOrder } from '@/api/monitoring/groupTeamView'
-import { workOrderList } from '@/api/base/workOrder';
+import { workOrderList } from '@/api/base/workOrder'
-import GroupTeamViewDetail from './components/groupTeamViewDetail.vue';
+import GroupTeamViewDetail from './components/groupTeamViewDetail.vue'
-import { publicFormatter } from '@/utils/dict';
+import { publicFormatter } from '@/utils/dict'
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'roomNameDict',
+    prop: 'roomNameDict',
-		label: '车间名称',
+    label: '车间名称',
-		filter: publicFormatter('workshop'),
+    filter: publicFormatter('workshop'),
-		showOverflowtooltip: true,
+    showOverflowtooltip: true,
-		minWidth: 100,
+    minWidth: 100
-	},
+  },
-	{
+  {
-		prop: 'name',
+    prop: 'name',
-		label: '班组名称',
+    label: '班组名称'
-	},
+  },
-	{
+  {
-		prop: 'leaderName',
+    prop: 'leaderName',
-		label: '班组长',
+    label: '班组长'
-	},
+  },
-	{
+  {
-		prop: 'num',
+    prop: 'num',
-		label: '人数',
+    label: '人数'
-	},
+  },
-	{
+  {
-		prop: 'workCount',
+    prop: 'workCount',
-		label: '上班次数',
+    label: '上班次数'
-	},
+  }
-];
+]
 export default {
-	name: 'GroupTeamView',
+  name: 'GroupTeamView',
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'select',
-					type: 'select',
+          label: '工单',
-					label: '工单',
+          selectOptions: [],
-					selectOptions: [],
+          param: 'workOrderId',
-					param: 'workOrderId',
+          clearable: false,
-					clearable: false,
+          filterable: true
-					filterable: true,
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        }
-				},
+      ],
-			],
+      // 查询参数
-			// 查询参数
+      queryParams: {
-			queryParams: {
+        pageNo: 1,
-				pageNo: 1,
+        pageSize: 1000,
-				pageSize: 1000,
+        workOrderId: ''
-				workOrderId: '',
+      },
-			},
+      workOrderList: [],
-			heightNum: 220,
+      workOrderName: '',
-			workOrderList: [],
+      tableBtn: [
-			workOrderName: '',
+      this.$auth.hasPermi('base:group-team-view:detail')
-			tableBtn: [
+          ? {
-				this.$auth.hasPermi('base:group-team-view:detail')
+              type: 'detail',
-					? {
+              btnName: '详情'
-							type: 'detail',
+            }
-							btnName: '详情',
+          : undefined
-					  }
+      ].filter((v) => v),
-					: undefined,
+      tableProps,
-			].filter((v) => v),
+      tableH: this.tableHeight(220),
-			tableProps,
+      list: [],
-			list: [],
+      paramVisible: false
-			paramVisible: false,
+    }
-		};
+  },
-	},
+  components: { GroupTeamViewDetail },
-	components: { GroupTeamViewDetail },
+  mounted() {
-	mounted() {
+    window.addEventListener('resize', () => {
-		this.getOrderList();
+      this.tableH = this.tableHeight(220)
-	},
+    })
-	methods: {
+    this.getOrderList()
-		// 获取工单list
+  },
-		getOrderList() {
+  methods: {
-			workOrderList().then((res) => {
+    // 获取工单list
-				console.log(res);
+    getOrderList() {
-				this.formConfig[0].selectOptions = res.data || [];
+      workOrderList().then(res => {
-				this.workOrderList = res.data || [];
+        console.log(res)
-			});
+        this.formConfig[0].selectOptions = res.data || []
-		},
+        this.workOrderList = res.data || []
-		// 查询
+      })
-		buttonClick(val) {
+    },
-			if (!val.workOrderId) {
+    // 查询
-				this.$modal.msgWarning('工单不能为空');
+    buttonClick(val) {
-				return false;
+      if (!val.workOrderId) {
-			}
+        this.$modal.msgWarning('工单不能为空')
-			this.queryParams.workOrderId = val.workOrderId;
+        return false
-			this.getList();
+      }
-		},
+      this.queryParams.workOrderId = val.workOrderId
-		// 获取table数据
+      this.getList()
-		getList() {
+    },
-			getByWorkOrder({ id: this.queryParams.workOrderId }).then((res) => {
+    // 获取table数据
-				this.list = res.data || [];
+    getList() {
-			});
+      getByWorkOrder({ id: this.queryParams.workOrderId }).then(res => {
-		},
+        this.list = res.data || []
-		handleClick(val) {
+      })
-			this.paramVisible = true;
+    },
-			let params = {};
+    handleClick(val) {
-			params.teamId = val.data.id;
+      this.paramVisible = true
-			params.teamName = val.data.name;
+      let params = {}
-			this.workOrderList.map((item) => {
+      params.teamId = val.data.id
-				if (val.data.workOrderId === item.id) {
+      params.teamName = val.data.name
-					this.workOrderName = item.name;
+      this.workOrderList.map(item => {
-				}
+        if (val.data.workOrderId === item.id) {
-			});
+          this.workOrderName = item.name
-			params.workOrderId = val.data.workOrderId;
+        }
-			params.workOrderName = this.workOrderName;
+      })
-			params.roomNameDict = val.data.roomNameDict;
+      params.workOrderId = val.data.workOrderId
-			this.$nextTick(() => {
+      params.workOrderName = this.workOrderName
-				this.$refs.groupTeamViewDetail.init(params);
+      params.roomNameDict = val.data.roomNameDict
-			});
+      this.$nextTick(() => {
-		},
+        this.$refs.groupTeamViewDetail.init(params)
-	},
+      })
-};
+    }
+  }
+}
 </script>

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

@@ -1,146 +1,130 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
+    <!-- 搜索工作栏 -->
-		<search-area @submit="buttonClick" />
+    <search-area @submit="buttonClick" />
-		<!-- <search-bar
+    <!-- <search-bar
       :formConfigs="formConfig"
       ref="searchBarForm"
       @headBtnClick="buttonClick"
     /> -->
-		<!-- 列表 -->
+    <!-- 列表 -->
-		<base-table
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-			:page="queryParams.pageNo"
+      :max-height="tableH">
-			:limit="queryParams.pageSize"
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
-			:table-props="tableProps"
+        @clickBtn="handleClick" />
-			:table-data="list"
+    </base-table>
-			:max-height="tableH">
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-			<method-btn
+      @pagination="getList" />
-				v-if="tableBtn.length"
+    <!-- 查看生产情况 -->
-				slot="handleBtn"
+    <team-production-detail v-if='paramVisible' ref='schedulingMonitoringDetail' />
-				:width="80"
+  </div>
-				label="操作"
-				:method-list="tableBtn"
-				@clickBtn="handleClick" />
-		</base-table>
-		<pagination
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
-			@pagination="getList" />
-		<!-- 查看生产情况 -->
-		<team-production-detail
-			v-if="paramVisible"
-			ref="schedulingMonitoringDetail" />
-	</div>
 </template>
 <script>
-import { groupTeamSchedulingPage } from '@/api/monitoring/teamProduction';
+import { groupTeamSchedulingPage } from '@/api/monitoring/teamProduction'
-import { parseTime } from '@/utils/ruoyi';
+import { parseTime } from '@/utils/ruoyi'
-import TeamProductionDetail from './components/teamProductionDetail';
+import TeamProductionDetail from './components/teamProductionDetail'
-import { publicFormatter } from '@/utils/dict';
+import { publicFormatter } from '@/utils/dict'
-import SearchArea from './components/searchArea';
+import SearchArea from './components/searchArea'
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'roomNameDict',
+    prop: 'roomNameDict',
-		label: '车间名称',
+    label: '车间名称',
-		filter: publicFormatter('workshop'),
+    filter: publicFormatter('workshop'),
-		showOverflowtooltip: true,
+    showOverflowtooltip: true,
-		minWidth: 100,
+    minWidth: 100
-	},
+  },
-	// {
+  // {
-	//   prop: 'createTime',
+  //   prop: 'createTime',
-	//   label: '排班创建时间',
+  //   label: '排班创建时间',
-	//   filter: parseTime,
+  //   filter: parseTime,
-	//   minWidth: 160
+  //   minWidth: 160
-	// },
+  // },
-	{
+  {
-		prop: 'startDay',
+    prop: 'startDay',
-		label: '上班日期',
+    label: '上班日期',
-		minWidth: 100,
+    minWidth: 100
-	},
+  },
-	{
+  {
-		prop: 'startTime',
+    prop: 'startTime',
-		label: '上班时间',
+    label: '上班时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'endTime',
+    prop: 'endTime',
-		label: '下班时间',
+    label: '下班时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'classesName',
+    prop: 'classesName',
-		label: '班次名称',
+    label: '班次名称',
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'teamName',
+    prop: 'teamName',
-		label: '班组名称',
+    label: '班组名称',
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  }
-];
+]
 export default {
-	name: 'GroupTeamScheduling',
+  name: 'GroupTeamScheduling',
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      // 查询参数
-			// 查询参数
+      queryParams: {
-			queryParams: {
+        pageNo: 1,
-				pageNo: 1,
+        pageSize: 20,
-				pageSize: 20,
+        classesId: '',
-				classesId: '',
+        teamName: '',
-				teamName: '',
+        startDay: []
-				startDay: [],
+      },
-			},
+      tableProps,
-			tableProps,
+      tableBtn: [
-			tableBtn: [
+        this.$auth.hasPermi('base:team-production:detail')
-				this.$auth.hasPermi('base:team-production:detail')
+          ? {
-					? {
+            type: 'productionDetail',
-							type: 'productionDetail',
+            btnName: '查看',
-							btnName: '查看',
+            showTip: '生产情况'
-							showTip: '生产情况',
+          }
-					  }
+          : undefined
-					: undefined,
+      ].filter((v) => v),
-			].filter((v) => v),
+      list: [],
-			list: [],
+      tableH: this.tableHeight(260),
-			total: 0,
+      total: 0,
-			paramVisible: false,
+      paramVisible: false
-		};
+    }
-	},
+  },
-	components: { TeamProductionDetail, SearchArea },
+  components: { TeamProductionDetail, SearchArea },
-	mounted() {
+  mounted() {
-		this.getList();
+    window.addEventListener('resize', () => {
-	},
+      this.tableH = this.tableHeight(260)
-	methods: {
+    })
-		buttonClick(val) {
+    this.getList()
-			this.queryParams.pageNo = 1;
+  },
-			this.queryParams.classesId = val.classesId;
+  methods: {
-			this.queryParams.teamName = val.teamName;
+    buttonClick(val) {
-			this.queryParams.startDay[0] = val.tiemStr
+      this.queryParams.pageNo = 1;
-				? val.tiemStr[0] + ' 00:00:00'
+      this.queryParams.classesId = val.classesId
-				: '';
+      this.queryParams.teamName = val.teamName
-			this.queryParams.startDay[1] = val.tiemStr
+      this.queryParams.startDay[0] = val.tiemStr ? val.tiemStr[0] + ' 00:00:00' : ''
-				? val.tiemStr[1] + ' 23:59:59'
+      this.queryParams.startDay[1] = val.tiemStr ? val.tiemStr[1] + ' 23:59:59' : ''
-				: '';
+      this.getList()
-			this.getList();
+    },
-		},
+    getList() {
-		getList() {
+      groupTeamSchedulingPage({ ...this.queryParams }).then(res => {
-			groupTeamSchedulingPage({ ...this.queryParams }).then((res) => {
+        console.log(res)
-				console.log(res);
+        this.list = res.data.list || []
-				this.list = res.data.list || [];
+        this.total = res.data.total || 0
-				this.total = res.data.total || 0;
+      })
-			});
+    },
-		},
+    handleClick(val) {
-		handleClick(val) {
+      console.log(val)
-			console.log(val);
+      this.paramVisible = true
-			this.paramVisible = true;
+      this.$nextTick(() => {
-			this.$nextTick(() => {
+        this.$refs.schedulingMonitoringDetail.init(val.data)
-				this.$refs.schedulingMonitoringDetail.init(val.data);
+      })
-			});
+    }
-		},
+  }
-	},
+}
-};
 </script>

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

@@ -1,465 +1,440 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
+    <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar
-			:formConfigs="formConfig"
+      :formConfigs="formConfig"
-			ref="searchBarForm"
+      ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+      @headBtnClick="buttonClick"
-		<!-- 列表 -->
+    />
-		<base-table
+    <!-- 列表 -->
-			:page="queryParams.pageNo"
+    <base-table
-			:limit="queryParams.pageSize"
+      :page="queryParams.pageNo"
-			:table-props="tableProps"
+      :limit="queryParams.pageSize"
-			:table-data="list"
+      :table-props="tableProps"
-			:max-height="tableH">
+      :table-data="list"
-			<method-btn
+      :max-height="tableH"
-				v-if="tableBtn.length"
+    >
-				slot="handleBtn"
+      <method-btn
-				:width="240"
+        v-if="tableBtn.length"
-				label="操作"
+        slot="handleBtn"
-				:method-list="tableBtn"
+        :width="240"
-				@clickBtn="handleClick" />
+        label="操作"
-		</base-table>
+        :method-list="tableBtn"
-		<pagination
+        @clickBtn="handleClick"
-			:page.sync="queryParams.pageNo"
+      />
-			:limit.sync="queryParams.pageSize"
+    </base-table>
-			:total="total"
+    <pagination
-			@pagination="getList" />
+      :page.sync="queryParams.pageNo"
-		<!-- 新增&编辑 -->
+      :limit.sync="queryParams.pageSize"
-		<base-dialog
+      :total="total"
-			:dialogTitle="addOrEditTitle"
+      @pagination="getList"
-			:dialogVisible="centervisible"
+    />
-			@cancel="handleCancel"
+    <!-- 新增&编辑 -->
-			@confirm="handleConfirm"
+    <base-dialog
-			:before-close="handleCancel"
+      :dialogTitle="addOrEditTitle"
-			width="60%">
+      :dialogVisible="centervisible"
-			<order-group-add
+      @cancel="handleCancel"
-				ref="orderGroupAdd"
+      @confirm="handleConfirm"
-				@successSubmit="successSubmit" />
+      :before-close="handleCancel"
-		</base-dialog>
+      width='60%'
-		<!-- 查看详情 -->
+    >
-		<!-- 新增工单 -->
+      <order-group-add ref="orderGroupAdd" @successSubmit="successSubmit" />
-		<base-dialog
+    </base-dialog>
-			dialogTitle="绑定厂务订单"
+    <!-- 查看详情 -->
-			:dialogVisible="bindOrderVisible"
+    <!-- 新增工单 -->
-			@cancel="bindOrderCancel"
+    <base-dialog
-			@confirm="bindOrderConfirm"
+      dialogTitle="绑定厂务订单"
-			:before-close="bindOrderCancel"
+      :dialogVisible="bindOrderVisible"
-			width="60%">
+      @cancel="bindOrderCancel"
-			<bind-order
+      @confirm="bindOrderConfirm"
-				ref="bindOrder"
+      :before-close="bindOrderCancel"
-				@bindOrderSubmit="bindOrderSubmit" />
+      width='60%'
-		</base-dialog>
+    >
-	</div>
+      <bind-order ref="bindOrder" @bindOrderSubmit="bindOrderSubmit" />
+    </base-dialog>
+  </div>
 </template>
 <script>
-import { parseTime } from '@/utils/ruoyi';
+import { parseTime } from '@/utils/ruoyi'
-import { getOrderGroupPage, groupOrderStatusSet } from '@/api/base/orderGroup';
+import { getOrderGroupPage, groupOrderStatusSet } from '@/api/base/orderGroup'
-import { customerList } from '@/api/base/orderManage';
+import { customerList } from '@/api/base/orderManage'
-import OrderGroupAdd from './components/orderGroupAdd';
+import OrderGroupAdd from './components/orderGroupAdd'
-import BindOrder from './components/bindOrder';
+import BindOrder from './components/bindOrder'
-import { publicFormatter } from '@/utils/dict';
+import { publicFormatter } from '@/utils/dict'
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'createTime',
+    prop: 'createTime',
-		label: '添加时间',
+    label: '添加时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'name',
+    prop: 'name',
-		label: '订单名称',
+    label: '订单名称',
-		minWidth: 140,
+    minWidth: 140,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'code',
+    prop: 'code',
-		label: '订单编码',
+    label: '订单编码',
-		minWidth: 150,
+    minWidth: 150
-	},
+  },
-	{
+  {
-		prop: 'customerId',
+    prop: 'customerId',
-		label: '客户',
+    label: '客户',
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'status',
+    prop: 'status',
-		label: '订单状态',
+    label: '订单状态',
-		filter: publicFormatter('order_status'),
+    filter: publicFormatter('order_status')
-	},
+  },
-	{
+  {
-		prop: 'productName',
+    prop: 'productName',
-		label: '产品名称',
+    label: '产品名称',
-		minWidth: 200,
+    minWidth: 200,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'specifications',
+    prop: 'specifications',
-		label: '产品规格',
+    label: '产品规格',
-		minWidth: 120,
+    minWidth: 120,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'unit',
+    prop: 'unit',
-		label: '单位',
+    label: '单位',
-		filter: publicFormatter('unit_dict'),
+    filter: publicFormatter('unit_dict')
-	},
+  },
-	{
+  {
-		prop: 'planQuantity',
+    prop: 'planQuantity',
-		label: '计划加工量',
+    label: '计划加工量',
-		width: 100,
+    width: 100
-	},
+  },
-	{
+  {
-		prop: 'actualquantity',
+    prop: 'actualquantity',
-		label: '实际加工量',
+    label: '实际加工量',
-		width: 100,
+    width: 100
-	},
+  },
-	{
+  {
-		prop: 'deliveTime',
+    prop: 'deliveTime',
-		label: '交货时间',
+    label: '交货时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'packReq',
+    prop: 'packReq',
-		label: '包装要求',
+    label: '包装要求',
-		// filter: publicFormatter('pack_spec'),
+    // filter: publicFormatter('pack_spec'),
-		minWidth: 120,
+    minWidth: 120,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'orderIdNum',
+    prop: 'orderIdNum',
-		label: '订单数量',
+    label: '订单数量'
-	},
+  }  
-];
+]
 export default {
-	name: 'OrderGroup',
+  name: 'OrderGroup',
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '订单名称',
-					label: '订单名称',
+          placeholder: '订单名称',
-					placeholder: '订单名称',
+          param: 'name'
-					param: 'name',
+        },
-				},
+        {
-				{
+          type: 'select',
-					type: 'select',
+          label: '状态',
-					label: '状态',
+          selectOptions: this.getDictDatas(this.DICT_TYPE.ORDER_STATUS),
-					selectOptions: this.getDictDatas(this.DICT_TYPE.ORDER_STATUS),
+          labelField: 'label',
-					labelField: 'label',
+          valueField: 'value',
-					valueField: 'value',
+          param: 'status'
-					param: 'status',
+        },
-				},
+        {
-				{
+          type: 'datePicker',
-					type: 'datePicker',
+          label: '时间段',
-					label: '时间段',
+          dateType: 'daterange',
-					dateType: 'daterange',
+          format: 'yyyy-MM-dd',
-					format: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
-					valueFormat: 'yyyy-MM-dd',
+          rangeSeparator: '-',
-					rangeSeparator: '-',
+          startPlaceholder: '开始时间',
-					startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
-					endPlaceholder: '结束时间',
+          param: 'timeVal',
-					param: 'timeVal',
+          defaultSelect: [],
-					defaultSelect: [],
+          width: 250
-					width: 250,
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:order-group:create') ? 'separate' : '',
-					type: this.$auth.hasPermi('base:order-group:create')
+        },
-						? 'separate'
+        {
-						: '',
+          type: this.$auth.hasPermi('base:order-group:create') ? 'button' : '',
-				},
+          btnName: '新增',
-				{
+          name: 'add',
-					type: this.$auth.hasPermi('base:order-group:create') ? 'button' : '',
+          color: 'success',
-					btnName: '新增',
+          plain: true
-					name: 'add',
+        }
-					color: 'success',
+      ],
-					plain: true,
+      // 查询参数
-				},
+      queryParams: {
-			],
+        pageNo: 1,
-			// 查询参数
+        pageSize: 20,
-			queryParams: {
+        name: null,
-				pageNo: 1,
+        status: null,
-				pageSize: 20,
+        planFinishTime: []
-				name: null,
+      },
-				status: null,
+      total: 0,
-				planFinishTime: [],
+      tableProps,
-			},
+      list: [],
-			total: 0,
+      tableH: this.tableHeight(260),
-			tableProps,
+      tableBtn: [
-			list: [],
+      this.$auth.hasPermi('base:order-group:bind')
-			tableBtn: [
+          ? {
-				this.$auth.hasPermi('base:order-group:bind')
+              type: 'bind',
-					? {
+              btnName: '绑定',
-							type: 'bind',
+              showTip: '厂务订单',
-							btnName: '绑定',
+              showParam: {
-							showTip: '厂务订单',
+                type: '&',
-							showParam: {
+                data: [
-								type: '&',
+                  {
-								data: [
+                    type: 'less',
-									{
+                    name: 'status',
-										type: 'less',
+                    value: 3
-										name: 'status',
+                  }
-										value: 3,
+                ]
-									},
+              }
-								],
+            }
-							},
+          : undefined,
-					  }
+      this.$auth.hasPermi('base:order-group:complete')
-					: undefined,
+          ? {
-				this.$auth.hasPermi('base:order-group:complete')
+              type: 'complete',
-					? {
+              btnName: '完成',
-							type: 'complete',
+              showTip: '完成订单',
-							btnName: '完成',
+              showParam: {
-							showTip: '完成订单',
+                type: '&',
-							showParam: {
+                data: [
-								type: '&',
+                  {
-								data: [
+                    type: 'equal',
-									{
+                    name: 'status',
-										type: 'equal',
+                    value: 3
-										name: 'status',
+                  }
-										value: 3,
+                ]
-									},
+              }
-								],
+            }
-							},
+          : undefined,
-					  }
+          this.$auth.hasPermi('base:order-group:termination')
-					: undefined,
+          ? {
-				this.$auth.hasPermi('base:order-group:termination')
+              type: 'termination',
-					? {
+              btnName: '终止',
-							type: 'termination',
+              showTip: '终止',
-							btnName: '终止',
+              showParam: {
-							showTip: '终止',
+                type: '&',
-							showParam: {
+                data: [
-								type: '&',
+                  {
-								data: [
+                    type: 'equal',
-									{
+                    name: 'status',
-										type: 'equal',
+                    value: 3
-										name: 'status',
+                  }
-										value: 3,
+                ]
-									},
+              }
-								],
+            }
-							},
+          : undefined,
-					  }
+          this.$auth.hasPermi('base:order-group:cancel')
-					: undefined,
+          ? {
-				this.$auth.hasPermi('base:order-group:cancel')
+              type: 'cancel',
-					? {
+              btnName: '作废',
-							type: 'cancel',
+              showTip: '作废',
-							btnName: '作废',
+              showParam: {
-							showTip: '作废',
+                type: '&',
-							showParam: {
+                data: [
-								type: '&',
+                  {
-								data: [
+                    type: 'less',
-									{
+                    name: 'status',
-										type: 'less',
+                    value: 2
-										name: 'status',
+                  }
-										value: 2,
+                ]
-									},
+              }
-								],
+            }
-							},
+          : undefined,
-					  }
+          {
-					: undefined,
+            type: 'detail',
-				{
+            btnName: '详情'
-					type: 'detail',
+          },
-					btnName: '详情',
+        this.$auth.hasPermi('base:order-group:edit')
-				},
+          ? {
-				this.$auth.hasPermi('base:order-group:edit')
+              type: 'edit',
-					? {
+              btnName: '编辑',
-							type: 'edit',
+              showParam: {
-							btnName: '编辑',
+                type: '&',
-							showParam: {
+                data: [
-								type: '&',
+                  {
-								data: [
+                    type: 'less',
-									{
+                    name: 'status',
-										type: 'less',
+                    value: 2
-										name: 'status',
+                  }
-										value: 2,
+                ]
-									},
+              }
-								],
+            }
-							},
+          : undefined
-					  }
+      ].filter((v) => v),
-					: undefined,
+      addOrEditTitle: '',
-			].filter((v) => v),
+      centervisible: false,
-			addOrEditTitle: '',
+      priorityList: this.getDictDatas(this.DICT_TYPE.ORDER_PRIORITY),
-			centervisible: false,
+      workIssueTitle: '',
-			priorityList: this.getDictDatas(this.DICT_TYPE.ORDER_PRIORITY),
+      bindOrderVisible: false,
-			workIssueTitle: '',
+      orderDetailVisible: false
-			bindOrderVisible: false,
+    }
-			orderDetailVisible: false,
+  },
-		};
+  components: { OrderGroupAdd, BindOrder },
-	},
+  created() {
-	components: { OrderGroupAdd, BindOrder },
+    window.addEventListener('resize', () => {
-	created() {
+      this.tableH = this.tableHeight(260)
-		this.getList();
+    })
-	},
+    this.getList()
-	methods: {
+  },
-		getList() {
+  methods: {
-			getOrderGroupPage({ ...this.queryParams }).then((res) => {
+    getList() {
-				let arr = res.data.records || [];
+      getOrderGroupPage({...this.queryParams}).then(res => {
-				this.total = res.data.total || 0;
+        let arr = res.data.records || []
-				if (arr.length > 0) {
+        this.total = res.data.total || 0
-					customerList().then((result) => {
+        if (arr.length > 0) {
-						let tempData = result.data || [];
+          customerList().then(result => {
-						if (tempData.length > 0) {
+            let tempData = result.data || []
-							arr.map((item) => {
+            if (tempData.length > 0) {
-								for (let i of tempData) {
+              arr.map(item => {
-									if (item.customerId === i.id) {
+                for (let i of tempData) {
-										item.customerId = i.name;
+                  if (item.customerId === i.id) {
-									}
+                    item.customerId = i.name
-								}
+                  }
-							});
+                }
-							this.list = arr;
+              })
-						}
+              this.list = arr
-					});
+            }
-				} else {
+          })
-					this.list = arr;
+        }else {
-				}
+          this.list = arr
-			});
+        }
-		},
+      })
-		buttonClick(val) {
+    },
-			console.log(val);
+    buttonClick(val) {
-			if (val.btnName === 'search') {
+      console.log(val)
-				this.queryParams.name = val.name;
+      if (val.btnName === 'search') {
-				this.queryParams.status = val.status;
+        this.queryParams.name = val.name
-				if (val.timeVal && val.timeVal.length > 0) {
+        this.queryParams.status = val.status
-					this.queryParams.planFinishTime[0] = val.timeVal[0] + ' 00:00:00';
+        if (val.timeVal && val.timeVal.length > 0) {
-					this.queryParams.planFinishTime[1] = val.timeVal[1] + ' 23:59:59';
+          this.queryParams.planFinishTime[0] = val.timeVal[0] + ' 00:00:00'
-				} else {
+          this.queryParams.planFinishTime[1] = val.timeVal[1] + ' 23:59:59'
-					this.queryParams.planFinishTime = [];
+        } else {
-				}
+          this.queryParams.planFinishTime = []
-				this.getList();
+        }
-			} else {
+        this.getList()
-				this.addOrEditTitle = '新增';
+      } else {
-				this.centervisible = true;
+        this.addOrEditTitle = '新增'
-				this.$nextTick(() => {
+        this.centervisible = true
-					this.$refs.orderGroupAdd.init();
+        this.$nextTick(() => {
-				});
+          this.$refs.orderGroupAdd.init()
-			}
+        })
-		},
+      }
-		handleClick(val) {
+    },
-			console.log(val);
+    handleClick(val) {
-			switch (val.type) {
+      console.log(val)
-				case 'edit':
+      switch (val.type) {
-					this.addOrEditTitle = '编辑';
+        case 'edit':
-					this.centervisible = true;
+          this.addOrEditTitle = '编辑'
-					this.$nextTick(() => {
+          this.centervisible = true
-						this.$refs.orderGroupAdd.init(val.data.id);
+          this.$nextTick(() => {
-					});
+            this.$refs.orderGroupAdd.init(val.data.id)
-					break;
+          })
-				case 'cancel':
+          break
-					this.handleEditStatus(val.data, '作废', '6');
+        case 'cancel':
-					break;
+          this.handleEditStatus(val.data, '作废', '6')
-				case 'detail':
+          break
-					this.$router.push({
+        case 'detail':
-						path:
+          this.$router.push({path: '/order/base/order-group/order-group-detail-data?orderGroupId='+ val.data.id})
-							'/order/base/order-group/order-group-detail-data?orderGroupId=' +
+          break
-							val.data.id,
+        case 'termination':
-					});
+          this.handleEditStatus(val.data, '终止', '5')
-					break;
+          break
-				case 'termination':
+        case 'bind':
-					this.handleEditStatus(val.data, '终止', '5');
+          this.workIssueTitle = '绑定工单'
-					break;
+          this.bindOrderVisible = true
-				case 'bind':
+          this.$nextTick(() => {
-					this.workIssueTitle = '绑定工单';
+            this.$refs.bindOrder.init(val.data)
-					this.bindOrderVisible = true;
+          })
-					this.$nextTick(() => {
+          break
-						this.$refs.bindOrder.init(val.data);
+        case 'complete':
-					});
+          this.handleEditStatus(val.data, '完成', '4')
-					break;
+          break
-				case 'complete':
+        default:
-					this.handleEditStatus(val.data, '完成', '4');
+      }
-					break;
+    },
-				default:
+    // 完成,终止，作废
-			}
+    handleEditStatus(val, tip, status) {
-		},
+      let _this = this
-		// 完成,终止，作废
+      if (val.orderIdNum > 0) {// 有下级订单
-		handleEditStatus(val, tip, status) {
+        _this.$confirm('是否将"'+tip+'"操作同步至下级订单和工单?','确认信息', {
-			let _this = this;
+          type: 'warning',
-			if (val.orderIdNum > 0) {
+          distinguishCancelAndClose: true,
-				// 有下级订单
+          confirmButtonText: '同步',
-				_this
+          cancelButtonText: '不同步'
-					.$confirm(
+        }).then(function() {
-						'是否将"' + tip + '"操作同步至下级订单和工单?',
+          console.log('同步')
-						'确认信息',
+          groupOrderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
-						{
+            _this.getList();
-							type: 'warning',
+            _this.$modal.msgSuccess("操作成功");
-							distinguishCancelAndClose: true,
+          })
-							confirmButtonText: '同步',
+        }).catch(action => {
-							cancelButtonText: '不同步',
+          if (action === 'cancel') {
-						}
+            console.log('不同步')
-					)
+            groupOrderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
-					.then(function () {
+              _this.getList();
-						console.log('同步');
+              _this.$modal.msgSuccess("操作成功");
-						groupOrderStatusSet({
+            })
-							id: val.id,
+          }else {
-							status: status,
+            return console.log('关闭')
-							isSync: true,
+          }
-						}).then(() => {
+        })
-							_this.getList();
+      }else{// 无下级订单
-							_this.$modal.msgSuccess('操作成功');
+        _this.$modal.confirm('是否确认"'+tip+'"集团订单名称为"' + val.name + '"的数据项?').then(function() {
-						});
+          return groupOrderStatusSet({ id: val.id, status: status})
-					})
+        }).then(() => {
-					.catch((action) => {
+          _this.getList();
-						if (action === 'cancel') {
+          _this.$modal.msgSuccess("操作成功");
-							console.log('不同步');
+        }).catch(() => {});
-							groupOrderStatusSet({
+      }
-								id: val.id,
+    },
-								status: status,
+    handleCancel() {
-								isSync: false,
+      this.$refs.orderGroupAdd.formClear()
-							}).then(() => {
+      this.centervisible = false
-								_this.getList();
+      this.addOrEditTitle = ''
-								_this.$modal.msgSuccess('操作成功');
+    },
-							});
+    handleConfirm() {
-						} else {
+      this.$refs.orderGroupAdd.submitForm()
-							return console.log('关闭');
+    },
-						}
+    successSubmit() {
-					});
+      this.handleCancel()
-			} else {
+      this.getList()
-				// 无下级订单
+    },
-				_this.$modal
+    // 下发新增
-					.confirm(
+    bindOrderCancel() {
-						'是否确认"' + tip + '"集团订单名称为"' + val.name + '"的数据项?'
+      this.$refs.bindOrder.formClear()
-					)
+      this.bindOrderVisible = false
-					.then(function () {
+    },
-						return groupOrderStatusSet({ id: val.id, status: status });
+    bindOrderConfirm() {
-					})
+      this.$refs.bindOrder.bindOrderSubmit()
-					.then(() => {
+    },
-						_this.getList();
+    bindOrderSubmit() {
-						_this.$modal.msgSuccess('操作成功');
+      this.bindOrderCancel()
-					})
+      this.getList()
-					.catch(() => {});
+    }
-			}
+  }
-		},
+}
-		handleCancel() {
-			this.$refs.orderGroupAdd.formClear();
-			this.centervisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.$refs.orderGroupAdd.submitForm();
-		},
-		successSubmit() {
-			this.handleCancel();
-			this.getList();
-		},
-		// 下发新增
-		bindOrderCancel() {
-			this.$refs.bindOrder.formClear();
-			this.bindOrderVisible = false;
-		},
-		bindOrderConfirm() {
-			this.$refs.bindOrder.bindOrderSubmit();
-		},
-		bindOrderSubmit() {
-			this.bindOrderCancel();
-			this.getList();
-		},
-	},
-};
 </script>

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

@@ -1,494 +1,470 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
+    <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar
-			:formConfigs="formConfig"
+      :formConfigs="formConfig"
-			ref="searchBarForm"
+      ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+      @headBtnClick="buttonClick"
-		<!-- 列表 -->
+    />
-		<base-table
+    <!-- 列表 -->
-			:page="queryParams.pageNo"
+    <base-table
-			:limit="queryParams.pageSize"
+      :page="queryParams.pageNo"
-			:table-props="tableProps"
+      :limit="queryParams.pageSize"
-			:table-data="list"
+      :table-props="tableProps"
-			:max-height="tableH">
+      :table-data="list"
-			<method-btn
+      :max-height="tableH"
-				v-if="tableBtn.length"
+    >
-				slot="handleBtn"
+      <method-btn
-				:width="290"
+        v-if="tableBtn.length"
-				label="操作"
+        slot="handleBtn"
-				:method-list="tableBtn"
+        :width="290"
-				@clickBtn="handleClick" />
+        label="操作"
-		</base-table>
+        :method-list="tableBtn"
-		<pagination
+        @clickBtn="handleClick"
-			:page.sync="queryParams.pageNo"
+      />
-			:limit.sync="queryParams.pageSize"
+    </base-table>
-			:total="total"
+    <pagination
-			@pagination="getList" />
+      :page.sync="queryParams.pageNo"
-		<!-- 新增&编辑 -->
+      :limit.sync="queryParams.pageSize"
-		<base-dialog
+      :total="total"
-			:dialogTitle="addOrEditTitle"
+      @pagination="getList"
-			:dialogVisible="centervisible"
+    />
-			@cancel="handleCancel"
+    <!-- 新增&编辑 -->
-			@confirm="handleConfirm"
+    <base-dialog
-			:before-close="handleCancel"
+      :dialogTitle="addOrEditTitle"
-			width="60%">
+      :dialogVisible="centervisible"
-			<order-add
+      @cancel="handleCancel"
-				ref="orderAdd"
+      @confirm="handleConfirm"
-				@successSubmit="successSubmit" />
+      :before-close="handleCancel"
-		</base-dialog>
+      width='60%'
-		<!-- 查看详情 -->
+    >
-		<!-- 新增工单 -->
+      <order-add ref="orderAdd" @successSubmit="successSubmit" />
-		<base-dialog
+    </base-dialog>
-			:dialogTitle="workIssueTitle"
+    <!-- 查看详情 -->
-			:dialogVisible="addWorkOrdervisible"
+    <!-- 新增工单 -->
-			@cancel="addWorkOrderCancel"
+    <base-dialog
-			@confirm="addWorkOrderConfirm"
+      :dialogTitle="workIssueTitle"
-			:before-close="addWorkOrderCancel"
+      :dialogVisible="addWorkOrdervisible"
-			width="70%">
+      @cancel="addWorkOrderCancel"
-			<add-work-order
+      @confirm="addWorkOrderConfirm"
-				ref="addWorkOrder"
+      :before-close="addWorkOrderCancel"
-				@addWorkOrderSubmit="addWorkOrderSubmit" />
+      width='70%'
-		</base-dialog>
+    >
-	</div>
+      <add-work-order ref="addWorkOrder" @addWorkOrderSubmit="addWorkOrderSubmit" />
+    </base-dialog>
+  </div>
 </template>
 <script>
-import { parseTime } from '@/utils/ruoyi';
+import { parseTime } from '@/utils/ruoyi'
-import {
+import { getOrderPage, orderStatusSet, customerList, orderFinish } from '@/api/base/orderManage'
-	getOrderPage,
+import OrderAdd from './components/orderAdd'
-	orderStatusSet,
+import AddWorkOrder from './components/addWorkOrder'
-	customerList,
+import { publicFormatter } from '@/utils/dict'
-	orderFinish,
-} from '@/api/base/orderManage';
-import OrderAdd from './components/orderAdd';
-import AddWorkOrder from './components/addWorkOrder';
-import { publicFormatter } from '@/utils/dict';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'createTime',
+    prop: 'createTime',
-		label: '添加时间',
+    label: '添加时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'name',
+    prop: 'name',
-		label: '订单名称',
+    label: '订单名称',
-		minWidth: 140,
+    minWidth: 140,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'code',
+    prop: 'code',
-		label: '订单编码',
+    label: '订单编码',
-		minWidth: 150,
+    minWidth: 150,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'triggerOrigin',
+    prop: 'triggerOrigin',
-		label: '来源',
+    label: '来源',
-		filter: publicFormatter('order_Origin'),
+    filter: publicFormatter('order_Origin')
-	},
+  },
-	{
+  {
-		prop: 'priority',
+    prop: 'priority',
-		label: '优先级',
+    label: '优先级',
-		filter: publicFormatter('order_priority'),
+    filter: publicFormatter('order_priority')
-	},
+  },
-	{
+  {
-		prop: 'status',
+    prop: 'status',
-		label: '订单状态',
+    label: '订单状态',
-		filter: publicFormatter('order_status'),
+    filter: publicFormatter('order_status')
-	},
+  },
-	{
+  {
-		prop: 'planQuantity',
+    prop: 'planQuantity',
-		label: '计划加工量',
+    label: '计划加工量',
-		width: 100,
+    width: 100
-	},
+  },
-	{
+  {
-		prop: 'actualQuantity',
+    prop: 'actualQuantity',
-		label: '实际加工量',
+    label: '实际加工量',
-		width: 100,
+    width: 100
-	},
+  },
-	{
+  {
-		prop: 'productName',
+    prop: 'productName',
-		label: '产品',
+    label: '产品',
-		width: 200,
+    width: 200,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'unit',
+    prop: 'unit',
-		label: '单位',
+    label: '单位',
-		filter: publicFormatter('unit_dict'),
+    filter: publicFormatter('unit_dict')
-	},
+  },
-	{
+  {
-		prop: 'price',
+    prop: 'price',
-		label: '单价(元)',
+    label: '单价(元)',
-		align: 'right',
+    align: 'right'
-	},
+  },
-	{
+  {
-		prop: 'workOrderNum',
+    prop: 'workOrderNum',
-		label: '工单数量',
+    label: '工单数量'
-	},
+  }
-];
+]
 export default {
-	name: 'OrderManage',
+  name: 'OrderManage',
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '订单名称',
-					label: '订单名称',
+          placeholder: '订单名称',
-					placeholder: '订单名称',
+          param: 'name'
-					param: 'name',
+        },
-				},
+        {
-				{
+          type: 'select',
-					type: 'select',
+          label: '状态',
-					label: '状态',
+          selectOptions: this.getDictDatas(this.DICT_TYPE.ORDER_STATUS),
-					selectOptions: this.getDictDatas(this.DICT_TYPE.ORDER_STATUS),
+          labelField: 'label',
-					labelField: 'label',
+          valueField: 'value',
-					valueField: 'value',
+          param: 'status'
-					param: 'status',
+        },
-				},
+        {
-				{
+          type: 'datePicker',
-					type: 'datePicker',
+          label: '时间段',
-					label: '时间段',
+          dateType: 'daterange',
-					dateType: 'daterange',
+          format: 'yyyy-MM-dd',
-					format: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
-					valueFormat: 'yyyy-MM-dd',
+          rangeSeparator: '-',
-					rangeSeparator: '-',
+          startPlaceholder: '开始时间',
-					startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
-					endPlaceholder: '结束时间',
+          param: 'timeVal',
-					param: 'timeVal',
+          defaultSelect: [],
-					defaultSelect: [],
+          width: 250
-					width: 250,
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
-					type: this.$auth.hasPermi('base:order-manage:create')
+        },
-						? 'separate'
+        {
-						: '',
+          type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
-				},
+          btnName: '新增',
-				{
+          name: 'add',
-					type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+          color: 'success',
-					btnName: '新增',
+          plain: true
-					name: 'add',
+        }
-					color: 'success',
+      ],
-					plain: true,
+      // 查询参数
-				},
+      queryParams: {
-			],
+        pageNo: 1,
-			// 查询参数
+        pageSize: 20,
-			queryParams: {
+        name: null,
-				pageNo: 1,
+        status: null,
-				pageSize: 20,
+        lastIssuedTime: []
-				name: null,
+      },
-				status: null,
+      total: 0,
-				lastIssuedTime: [],
+      tableProps,
-			},
+      list: [],
-			total: 0,
+      tableH: this.tableHeight(260),
-			tableProps,
+      tableBtn: [
-			list: [],
+      this.$auth.hasPermi('base:order-manage:addWorkOrder')
-			tableBtn: [
+          ? {
-				this.$auth.hasPermi('base:order-manage:addWorkOrder')
+              type: 'add',
-					? {
+              btnName: '新增',
-							type: 'add',
+              showTip: '新增工单',
-							btnName: '新增',
+              showParam: {
-							showTip: '新增工单',
+                type: '&',
-							showParam: {
+                data: [
-								type: '&',
+                  {
-								data: [
+                    type: 'less',
-									{
+                    name: 'status',
-										type: 'less',
+                    value: 3
-										name: 'status',
+                  }
-										value: 3,
+                ]
-									},
+              }
-								],
+            }
-							},
+          : undefined,
-					  }
+      this.$auth.hasPermi('base:order-manage:bindWorkOrder')
-					: undefined,
+          ? {
-				this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+              type: 'bind',
-					? {
+              btnName: '绑定',
-							type: 'bind',
+              showTip: '绑定工单',
-							btnName: '绑定',
+              showParam: {
-							showTip: '绑定工单',
+                type: '&',
-							showParam: {
+                data: [
-								type: '&',
+                  {
-								data: [
+                    type: 'less',
-									{
+                    name: 'status',
-										type: 'less',
+                    value: 3
-										name: 'status',
+                  }
-										value: 3,
+                ]
-									},
+              }
-								],
+            }
-							},
+          : undefined,
-					  }
+      this.$auth.hasPermi('base:order-manage:complete')
-					: undefined,
+          ? {
-				this.$auth.hasPermi('base:order-manage:complete')
+              type: 'complete',
-					? {
+              btnName: '完成',
-							type: 'complete',
+              showTip: '完成订单',
-							btnName: '完成',
+              showParam: {
-							showTip: '完成订单',
+                type: '&',
-							showParam: {
+                data: [
-								type: '&',
+                  {
-								data: [
+                    type: 'equal',
-									{
+                    name: 'status',
-										type: 'equal',
+                    value: 3
-										name: 'status',
+                  }
-										value: 3,
+                ]
-									},
+              }
-								],
+            }
-							},
+          : undefined,
-					  }
+      this.$auth.hasPermi('base:order-manage:termination')
-					: undefined,
+        ? {
-				this.$auth.hasPermi('base:order-manage:termination')
+            type: 'termination',
-					? {
+            btnName: '终止',
-							type: 'termination',
+            showTip: '终止',
-							btnName: '终止',
+            showParam: {
-							showTip: '终止',
+                type: '&',
-							showParam: {
+                data: [
-								type: '&',
+                  {
-								data: [
+                    type: 'equal',
-									{
+                    name: 'status',
-										type: 'equal',
+                    value: 3
-										name: 'status',
+                  }
-										value: 3,
+                ]
-									},
+              }
-								],
+          }
-							},
+        : undefined,
-					  }
+      this.$auth.hasPermi('base:order-manage:cancel')
-					: undefined,
+        ? {
-				this.$auth.hasPermi('base:order-manage:cancel')
+            type: 'cancel',
-					? {
+            btnName: '作废',
-							type: 'cancel',
+            showTip: '作废',
-							btnName: '作废',
+            showParam: {
-							showTip: '作废',
+              type: '&',
-							showParam: {
+              data: [
-								type: '&',
+                {
-								data: [
+                  type: 'less',
-									{
+                  name: 'status',
-										type: 'less',
+                  value: 2
-										name: 'status',
+                }
-										value: 2,
+              ]
-									},
+            }
-								],
+          }
-							},
+        : undefined,
-					  }
+      this.$auth.hasPermi('base:order-manage:detail')
-					: undefined,
+          ? {
-				this.$auth.hasPermi('base:order-manage:detail')
+              type: 'detail',
-					? {
+              btnName: '详情'
-							type: 'detail',
+            }
-							btnName: '详情',
+          : undefined,
-					  }
+        this.$auth.hasPermi('base:order-manage:edit')
-					: undefined,
+          ? {
-				this.$auth.hasPermi('base:order-manage:edit')
+              type: 'edit',
-					? {
+              btnName: '编辑',
-							type: 'edit',
+              showParam: {
-							btnName: '编辑',
+                type: '&',
-							showParam: {
+                data: [
-								type: '&',
+                  {
-								data: [
+                    type: 'less',
-									{
+                    name: 'status',
-										type: 'less',
+                    value: 2
-										name: 'status',
+                  }
-										value: 2,
+                ]
-									},
+              }
-								],
+            }
-							},
+          : undefined
-					  }
+      ].filter((v) => v),
-					: undefined,
+      addOrEditTitle: '',
-			].filter((v) => v),
+      centervisible: false,
-			addOrEditTitle: '',
+      priorityList: this.getDictDatas(this.DICT_TYPE.ORDER_PRIORITY),
-			centervisible: false,
+      workIssueTitle: '',
-			priorityList: this.getDictDatas(this.DICT_TYPE.ORDER_PRIORITY),
+      addWorkOrdervisible: false,
-			workIssueTitle: '',
+      orderDetailVisible: false
-			addWorkOrdervisible: false,
+    }
-			orderDetailVisible: false,
+  },
-		};
+  components: { OrderAdd, AddWorkOrder },
-	},
+  created() {
-	components: { OrderAdd, AddWorkOrder },
+    window.addEventListener('resize', () => {
-	created() {
+      this.tableH = this.tableHeight(260)
-		this.getList();
+    })
-	},
+    this.getList()
-	methods: {
+  },
-		getList() {
+  methods: {
-			getOrderPage({ ...this.queryParams }).then((res) => {
+    getList() {
-				let arr = res.data.records || [];
+      getOrderPage({...this.queryParams}).then(res => {
-				this.total = res.data.total || 0;
+        let arr = res.data.records || []
-				if (arr.length > 0) {
+        this.total = res.data.total || 0
-					customerList().then((result) => {
+        if (arr.length > 0) {
-						let tempData = result.data || [];
+          customerList().then(result => {
-						if (tempData.length > 0) {
+            let tempData = result.data || []
-							arr.map((item) => {
+            if (tempData.length > 0) {
-								for (let i of tempData) {
+              arr.map(item => {
-									if (item.customerId === i.id) {
+                for (let i of tempData) {
-										item.customerId = i.name;
+                  if (item.customerId === i.id) {
-									}
+                    item.customerId = i.name
-								}
+                  }
-								item.price = item.price ? item.price.toFixed(2) : '0.00';
+                }
-							});
+                item.price =  item.price ? item.price.toFixed(2) : '0.00'
-							this.list = arr;
+              })
-						}
+              this.list = arr
-					});
+            }
-				} else {
+          })
-					this.list = arr;
+        }else {
-				}
+          this.list = arr
-			});
+        }
-		},
+      })
-		buttonClick(val) {
+    },
-			console.log(val);
+    buttonClick(val) {
-			if (val.btnName === 'search') {
+      console.log(val)
-				this.queryParams.name = val.name;
+      if (val.btnName === 'search') {
-				this.queryParams.status = val.status;
+        this.queryParams.name = val.name
-				if (val.timeVal && val.timeVal.length > 0) {
+        this.queryParams.status = val.status
-					this.queryParams.lastIssuedTime[0] = val.timeVal[0] + ' 00:00:00';
+        if (val.timeVal && val.timeVal.length > 0) {
-					this.queryParams.lastIssuedTime[1] = val.timeVal[1] + ' 23:59:59';
+          this.queryParams.lastIssuedTime[0] = val.timeVal[0] + ' 00:00:00'
-				} else {
+          this.queryParams.lastIssuedTime[1] = val.timeVal[1] + ' 23:59:59'
-					this.queryParams.lastIssuedTime = [];
+        } else {
-				}
+          this.queryParams.lastIssuedTime = []
-				this.getList();
+        }
-			} else {
+        this.getList()
-				this.addOrEditTitle = '新增';
+      } else {
-				this.centervisible = true;
+        this.addOrEditTitle = '新增'
-				this.$nextTick(() => {
+        this.centervisible = true
-					this.$refs.orderAdd.init();
+        this.$nextTick(() => {
-				});
+          this.$refs.orderAdd.init()
-			}
+        })
-		},
+      }
-		handleClick(val) {
+    },
-			console.log(val);
+    handleClick(val) {
-			switch (val.type) {
+      console.log(val)
-				case 'edit':
+      switch (val.type) {
-					this.addOrEditTitle = '编辑';
+        case 'edit':
-					this.centervisible = true;
+          this.addOrEditTitle = '编辑'
-					this.$nextTick(() => {
+          this.centervisible = true
-						this.$refs.orderAdd.init(val.data.id);
+          this.$nextTick(() => {
-					});
+            this.$refs.orderAdd.init(val.data.id)
-					break;
+          })
-				case 'cancel':
+          break
-					this.handleEditStatus(val.data, '作废', '6');
+        case 'cancel':
-					break;
+          this.handleEditStatus(val.data, '作废', '6')
-				case 'termination':
+          break
-					this.handleEditStatus(val.data, '终止', '5');
+        case 'termination':
-					break;
+          this.handleEditStatus(val.data, '终止', '5')
-				case 'detail':
+          break
-					this.$router.push({
+        case 'detail':
-						path:
+          this.$router.push({path: '/order/base/order-manage/order-detail-data?orderId='+ val.data.id})
-							'/order/base/order-manage/order-detail-data?orderId=' +
+          break
-							val.data.id,
+        case 'add':
-					});
+          this.workIssueTitle = '新增工单'
-					break;
+          this.addWorkOrdervisible = true
-				case 'add':
+          this.$nextTick(() => {
-					this.workIssueTitle = '新增工单';
+            this.$refs.addWorkOrder.init(val.data, 'add')
-					this.addWorkOrdervisible = true;
+          })
-					this.$nextTick(() => {
+          break
-						this.$refs.addWorkOrder.init(val.data, 'add');
+        case 'bind':
-					});
+          this.workIssueTitle = '绑定工单'
-					break;
+          this.addWorkOrdervisible = true
-				case 'bind':
+          this.$nextTick(() => {
-					this.workIssueTitle = '绑定工单';
+            this.$refs.addWorkOrder.init(val.data, 'bind')
-					this.addWorkOrdervisible = true;
+          })
-					this.$nextTick(() => {
+          break
-						this.$refs.addWorkOrder.init(val.data, 'bind');
+        case 'complete':
-					});
+          this.handleEditStatus(val.data, '完成', '4')
-					break;
+          break
-				case 'complete':
+        default:
-					this.handleEditStatus(val.data, '完成', '4');
+      }
-					break;
+    },
-				default:
+    // 完成,终止，作废
-			}
+    handleEditStatus(val, tip, status) {
-		},
+      let _this = this
-		// 完成,终止，作废
+      if (val.workOrderNum > 0) {//有下级工单
-		handleEditStatus(val, tip, status) {
+        _this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', {
-			let _this = this;
+          type: 'warning',
-			if (val.workOrderNum > 0) {
+          distinguishCancelAndClose: true,
-				//有下级工单
+          confirmButtonText: '同步',
-				_this
+          cancelButtonText: '不同步'
-					.$confirm('是否将"' + tip + '"操作同步至下级工单?', '确认信息', {
+        }).then(function() {
-						type: 'warning',
+          console.log('同步')
-						distinguishCancelAndClose: true,
+          orderStatusSet({ id: val.id, status: status, isSync: true}).then(() => {
-						confirmButtonText: '同步',
+            _this.getList();
-						cancelButtonText: '不同步',
+            _this.$modal.msgSuccess("操作成功");
-					})
+          })
-					.then(function () {
+        }).catch(action => {
-						console.log('同步');
+          if (action === 'cancel') {
-						orderStatusSet({ id: val.id, status: status, isSync: true }).then(
+            console.log('不同步')
-							() => {
+            orderStatusSet({ id: val.id, status: status, isSync: false}).then(() => {
-								_this.getList();
+              _this.getList();
-								_this.$modal.msgSuccess('操作成功');
+              _this.$modal.msgSuccess("操作成功");
-							}
+            })
-						);
+          }else {
-					})
+            return console.log('关闭')
-					.catch((action) => {
+          }
-						if (action === 'cancel') {
+        })
-							console.log('不同步');
+      }else{// 无下级工单
-							orderStatusSet({
+        _this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() {
-								id: val.id,
+          return orderStatusSet({ id: val.id, status: status})
-								status: status,
+        }).then(() => {
-								isSync: false,
+          _this.getList();
-							}).then(() => {
+          _this.$modal.msgSuccess("操作成功");
-								_this.getList();
+        }).catch(() => {});
-								_this.$modal.msgSuccess('操作成功');
+      }
-							});
+    },
-						} else {
+    // 新增
-							return console.log('关闭');
+    handleCancel() {
-						}
+      this.$refs.orderAdd.formClear()
-					});
+      this.centervisible = false
-			} else {
+      this.addOrEditTitle = ''
-				// 无下级工单
+    },
-				_this.$modal
+    handleConfirm() {
-					.confirm(
+      this.$refs.orderAdd.submitForm()
-						'是否确认"' + tip + '"厂务订单名称为"' + val.name + '"的数据项?'
+    },
-					)
+    successSubmit() {
-					.then(function () {
+      this.handleCancel()
-						return orderStatusSet({ id: val.id, status: status });
+      this.getList()
-					})
+    },
-					.then(() => {
+    // 下发新增
-						_this.getList();
+    addWorkOrderCancel() {
-						_this.$modal.msgSuccess('操作成功');
+      this.$refs.addWorkOrder.formClear()
-					})
+      this.addWorkOrdervisible = false
-					.catch(() => {});
+    },
-			}
+    addWorkOrderConfirm() {
-		},
+      this.$refs.addWorkOrder.addWorkOrderSubmit()
-		// 新增
+    },
-		handleCancel() {
+    addWorkOrderSubmit() {
-			this.$refs.orderAdd.formClear();
+      this.addWorkOrderCancel()
-			this.centervisible = false;
+      this.getList()
-			this.addOrEditTitle = '';
+    }
-		},
+    // bindWorkOrderCancel() {
-		handleConfirm() {
+    //   this.$refs.bindWorkOrder.formClear()
-			this.$refs.orderAdd.submitForm();
+    //   this.bindWorkOrdervisible = false
-		},
+    // },
-		successSubmit() {
+    // bindWorkOrderConfirm() {
-			this.handleCancel();
+    //   this.$refs.bindWorkOrder.bindWorkOrderSubmit()
-			this.getList();
+    // },
-		},
+    // bindWorkOrderSubmit() {
-		// 下发新增
+    //   this.bindWorkOrderCancel()
-		addWorkOrderCancel() {
+    //   this.getList()
-			this.$refs.addWorkOrder.formClear();
+    // }
-			this.addWorkOrdervisible = false;
+  }
-		},
+}
-		addWorkOrderConfirm() {
-			this.$refs.addWorkOrder.addWorkOrderSubmit();
-		},
-		addWorkOrderSubmit() {
-			this.addWorkOrderCancel();
-			this.getList();
-		},
-		// bindWorkOrderCancel() {
-		//   this.$refs.bindWorkOrder.formClear()
-		//   this.bindWorkOrdervisible = false
-		// },
-		// bindWorkOrderConfirm() {
-		//   this.$refs.bindWorkOrder.bindWorkOrderSubmit()
-		// },
-		// bindWorkOrderSubmit() {
-		//   this.bindWorkOrderCancel()
-		//   this.getList()
-		// }
-	},
-};
 </script>

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

@@ -1,427 +1,390 @@
 <template>
-	<div class="app-container orderMonitoring">
+  <div class="app-container orderMonitoring">
-		<!-- 搜索工作栏 -->
+    <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			:formConfigs="formConfig"
+    <el-tabs v-model="activeName" @tab-click="toggleTab">
-			ref="searchBarForm"
+      <el-tab-pane label="数据列表" name="dataList"></el-tab-pane>
-			@headBtnClick="buttonClick" />
+      <el-tab-pane label="环形图" name="barChart"></el-tab-pane>
-		<el-tabs
+    </el-tabs>
-			v-model="activeName"
+    <!-- 表 -->
-			@tab-click="toggleTab">
+    <div v-if="activeName === 'dataList'">
-			<el-tab-pane
+      <base-table :page="1" :limit="1000000000000" :table-props="tableProps" :table-data="list" :max-height="tableH"
-				label="数据列表"
+        row-key="id" :tree-props="{ children: 'orderMonitorVOS', hasChildren: 'hasChildren' }">
-				name="dataList"></el-tab-pane>
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
-			<el-tab-pane
+          @clickBtn="handleClick" />
-				label="环形图"
+      </base-table>
-				name="barChart"></el-tab-pane>
+    </div>
-		</el-tabs>
+    <!-- 图 -->
-		<!-- 表 -->
+    <monitoring-ring-charts ref='monitoringRingCharts' v-else :chart-list='chartList' />
-		<div v-if="activeName === 'dataList'">
+    <!-- <pagination
-			<base-table
-				:page="1"
-				:limit="1000000000000"
-				:table-props="tableProps"
-				:table-data="list"
-				:max-height="tableH"
-				row-key="id"
-				:tree-props="{
-					children: 'orderMonitorVOS',
-					hasChildren: 'hasChildren',
-				}">
-				<method-btn
-					v-if="tableBtn.length"
-					slot="handleBtn"
-					:width="100"
-					label="操作"
-					:method-list="tableBtn"
-					@clickBtn="handleClick" />
-			</base-table>
-		</div>
-		<!-- 图 -->
-		<monitoring-ring-charts
-			ref="monitoringRingCharts"
-			v-else
-			:chart-list="chartList" />
-		<!-- <pagination
       :page.sync="queryParams.pageNo"
       :limit.sync="queryParams.pageSize"
       :total="total"
       @pagination="getPage"
     /> -->
-	</div>
+  </div>
 </template>
 <script>
-import { parseTime } from '@/utils/ruoyi';
+import { parseTime } from '@/utils/ruoyi'
-import { publicFormatter } from '@/utils/dict';
+import { publicFormatter } from '@/utils/dict'
-import { orderGroupMonitor } from '@/api/base/orderGroup';
+import { orderGroupMonitor } from '@/api/base/orderGroup'
-import MonitoringRingCharts from './../components/monitoringRingCharts';
+import MonitoringRingCharts from './../components/monitoringRingCharts'
-import moment from 'moment';
+import moment from "moment"
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'name',
+    prop: 'name',
-		label: '订单名称',
+    label: '订单名称',
-		minWidth: 140,
+    minWidth: 140,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'orderType',
+    prop: 'orderType',
-		label: '订单类型',
+    label: '订单类型'
-	},
+  },
-	{
+  {
-		prop: 'customerName',
+    prop: 'customerName',
-		label: '客户',
+    label: '客户'
-	},
+  },
-	{
+  {
-		prop: 'productname',
+    prop: 'productname',
-		label: '产品',
+    label: '产品',
-		minWidth: 200,
+    minWidth: 200,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'planStartTime',
+    prop: 'planStartTime',
-		label: '计划开始时间',
+    label: '计划开始时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'planFinishTime',
+    prop: 'planFinishTime',
-		label: '计划完成时间',
+    label: '计划完成时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'status',
+    prop: 'status',
-		label: '订单状态',
+    label: '订单状态',
-		filter: publicFormatter('order_status'),
+    filter: publicFormatter('order_status')
-	},
+  },
-	{
+  {
-		prop: 'startProduceTime',
+    prop: 'startProduceTime',
-		label: '实际开始时间',
+    label: '实际开始时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'finishProduceTime',
+    prop: 'finishProduceTime',
-		label: '实际完成时间',
+    label: '实际完成时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'deliveTime',
+    prop: 'deliveTime',
-		label: '交货时间',
+    label: '交货时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'lineNames',
+    prop: 'lineNames',
-		label: '加工线',
+    label: '加工线',
-		filter: (val) => (val ? val.join(',') : ''),
+    filter: (val) => val ? val.join(',') : '',
-		minWidth: 180,
+    minWidth: 180
-	},
+  },
-	{
+  {
-		prop: 'planQuantity',
+    prop: 'planQuantity',
-		label: '计划生产量',
+    label: '计划生产量',
-		width: 100,
+    width: 100
-	},
+  },
-	{
+  {
-		prop: 'actualquantity',
+    prop: 'actualquantity',
-		label: '实际产出量',
+    label: '实际产出量',
-		width: 100,
+    width: 100
-	},
+  },
-	{
+  {
-		prop: 'completeRate',
+    prop: 'completeRate',
-		label: '订单完成率',
+    label: '订单完成率',
-		width: 100,
+    width: 100
-	},
+  },
-	{
+  {
-		prop: 'orderNum',
+    prop: 'orderNum',
-		label: '关联订单/工单数量',
+    label: '关联订单/工单数量',
-		width: 110,
+    width: 110
-	},
+  }
-];
+]
 export default {
-	name: 'OrderCompletionMonitoring',
+  name: 'OrderCompletionMonitoring',
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '集团订单名称',
-					label: '集团订单名称',
+          param: 'name'
-					param: 'name',
+        },
-				},
+        {
-				{
+          type: 'datePicker',
-					type: 'datePicker',
+          label: '时间段',
-					label: '时间段',
+          dateType: 'daterange',
-					dateType: 'daterange',
+          format: 'yyyy-MM-dd',
-					format: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
-					valueFormat: 'yyyy-MM-dd',
+          rangeSeparator: '-',
-					rangeSeparator: '-',
+          startPlaceholder: '开始时间',
-					startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
-					endPlaceholder: '结束时间',
+          param: 'timeVal',
-					param: 'timeVal',
+          defaultSelect: [],
-					defaultSelect: [],
+          width: 250
-					width: 250,
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        }
-				},
+      ],
-			],
+      activeName: 'dataList',
-			activeName: 'dataList',
+      // 查询参数
-			// 查询参数
+      queryParams: {
-			queryParams: {
+        name: null,
-				name: null,
+        deliveTime: []
-				deliveTime: [],
+      },
-			},
+      tableProps,
-			tableProps,
+      list: [],
-			list: [],
+      tableH: this.tableHeight(260),
-			total: 0,
+      total: 0,
-			tableBtn: [
+      tableBtn: [
-				this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
+        this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
-					? {
+          ? {
-							type: 'orderDetail',
+            type: 'orderDetail',
-							btnName: '详情',
+            btnName: '详情',
-							showTip: '订单/工单详情',
+            showTip: '订单/工单详情',
-							showParam: {
+            showParam: {
-								type: '&',
+              type: '&',
-								data: [
+              data: [
-									{
+                {
-										type: 'more',
+                  type: 'more',
-										name: 'orderNum',
+                  name: 'orderNum',
-										value: 1,
+                  value: 1
-									},
+                }
-								],
+              ]
-							},
+            }
-					  }
+          }
-					: undefined,
+          : undefined,
-				this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
+        this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
-					? {
+          ? {
-							type: 'qualityDetail',
+            type: 'qualityDetail',
-							btnName: '质量',
+            btnName: '质量',
-							showTip: '质量详情',
+            showTip: '质量详情',
-							showParam: {
+            showParam: {
-								type: '&',
+              type: '&',
-								data: [
+              data: [
-									{
+                {
-										type: 'more',
+                  type: 'more',
-										name: 'orderNum',
+                  name: 'orderNum',
-										value: 1,
+                  value: 1
-									},
+                },
-									{
+                {
-										type: 'unequal',
+                  type: 'unequal',
-										name: 'woIdString',
+                  name: 'woIdString',
-										value: '',
+                  value: ''
-									},
+                }
-								],
+              ]
-							},
+            }
-					  }
+          }
-					: undefined,
+          : undefined
-				// this.$auth.hasPermi('base:order-completion-monitoring:sendOut')
+        // this.$auth.hasPermi('base:order-completion-monitoring:sendOut')
-				//     ? {
+        //     ? {
-				//         type: 'sendOutDetail',
+        //         type: 'sendOutDetail',
-				//         btnName: '发货',
+        //         btnName: '发货',
-				//         showTip: '发货详情',
+        //         showTip: '发货详情',
-				//         showParam: {
+        //         showParam: {
-				//           type: '&',
+        //           type: '&',
-				//           data: [
+        //           data: [
-				//             {
+        //             {
-				//               type: 'more',
+        //               type: 'more',
-				//               name: 'workOrderNum',
+        //               name: 'workOrderNum',
-				//               value: 1
+        //               value: 1
-				//             }
+        //             }
-				//           ]
+        //           ]
-				//         }
+        //         }
-				//       }
+        //       }
-				//     : undefined
+        //     : undefined
-			].filter((v) => v),
+      ].filter((v) => v),
-			chartList: [],
+      chartList: []
-		};
+    }
-	},
+  },
-	components: { MonitoringRingCharts },
+  components: { MonitoringRingCharts },
-	mounted() {
+  mounted() {
-		let start = moment().subtract(30, 'days').format('yyyy-MM-DD');
+    window.addEventListener('resize', () => {
-		let end = moment().format('yyyy-MM-DD');
+      this.tableH = this.tableHeight(260)
-		this.formConfig[1].defaultSelect = [start, end];
+    })
-		this.queryParams.deliveTime[0] = start + ' 00:00:00';
+    let start = moment().subtract(30, 'days').format('yyyy-MM-DD')
-		this.queryParams.deliveTime[1] = end + ' 23:59:59';
+    let end = moment().format('yyyy-MM-DD')
-		this.getPage();
+    this.formConfig[1].defaultSelect = [start, end]
-	},
+    this.queryParams.deliveTime[0] = start + ' 00:00:00'
-	methods: {
+    this.queryParams.deliveTime[1] = end + ' 23:59:59'
-		getPage() {
+    this.getPage()
-			orderGroupMonitor({ ...this.queryParams }).then((res) => {
+  },
-				let arr = res.data || [];
+  methods: {
-				if (arr.length > 0) {
+    getPage() {
-					let color = ['#7164FF', '#288AFF', '#63BDFF', '#8EF0AB', '#FFCE6A'];
+      orderGroupMonitor({ ...this.queryParams }).then(res => {
-					let arr2 = [];
+        let arr = res.data || []
-					arr.map((item) => {
+        if (arr.length > 0) {
-						item.orderType = '集团订单'; //前端写死订单类型
+          let color = ['#7164FF', '#288AFF', '#63BDFF', '#8EF0AB', '#FFCE6A']
-						let woIdString = ''; //集团订单层添加工单str跳转质量用
+          let arr2 = []
-						//=========图数据
+          arr.map(item => {
-						let arr3 = [];
+            item.orderType = '集团订单'//前端写死订单类型
-						let obj = {};
+            let woIdString = ''//集团订单层添加工单str跳转质量用
-						obj.orderGroupName = item.name;
+            //=========图数据
-						obj.id = item.id;
+            let arr3 = []
-						obj.num = item.planQuantity || 0;
+            let obj = {}
-						let sunNum = 0;
+            obj.orderGroupName = item.name
-						if (item.orderMonitorVOS && item.orderMonitorVOS.length > 0) {
+            obj.id = item.id
-							for (let i = 0; i < item.orderMonitorVOS.length; i++) {
+            obj.num = item.planQuantity || 0
-								item.orderMonitorVOS[i].orderType = '厂务订单'; //前端写死订单类型
+            let sunNum = 0
-								item.orderMonitorVOS[i].id = item.orderMonitorVOS[i].orderid;
+            if (item.orderMonitorVOS && item.orderMonitorVOS.length > 0) {
-								item.orderMonitorVOS[i].orderNum =
+              for (let i = 0; i < item.orderMonitorVOS.length; i++) {
-									item.orderMonitorVOS[i].workOrderNum;
+                item.orderMonitorVOS[i].orderType = '厂务订单'//前端写死订单类型
-								woIdString += item.orderMonitorVOS[i].woIdString
+                item.orderMonitorVOS[i].id = item.orderMonitorVOS[i].orderid
-									? item.orderMonitorVOS[i].woIdString + ','
+                item.orderMonitorVOS[i].orderNum = item.orderMonitorVOS[i].workOrderNum
-									: '';
+                woIdString += item.orderMonitorVOS[i].woIdString ? item.orderMonitorVOS[i].woIdString : ''
-								//==============图数据
+                //==============图数据
-								let subObj = {};
+                let subObj = {}
-								subObj.value = item.orderMonitorVOS[i].actualquantity;
+                subObj.value = item.orderMonitorVOS[i].actualquantity
-								subObj.name = item.orderMonitorVOS[i].name;
+                subObj.name = item.orderMonitorVOS[i].name
-								if (i < 5) {
+                if (i < 5) {
-									subObj.color = color[i];
+                  subObj.color = color[i]
-								} else {
+                } else {
-									subObj.color = color[i % 5];
+                  subObj.color = color[i % 5]
-								}
+                }
-								sunNum += item.orderMonitorVOS[i].actualquantity || 0;
+                sunNum += (item.orderMonitorVOS[i].actualquantity || 0)
-								arr3.push(subObj);
+                arr3.push(subObj)
-							}
+              }
-							woIdString = woIdString.slice(0, -1);
+            }
-						}
+            item.woIdString = woIdString
-						item.woIdString = woIdString;
+            arr3.push({
-						arr3.push({
+              value: item.planQuantity - sunNum > 0 ? item.planQuantity - sunNum : 0,
-							value:
+              name: '未生产',
-								item.planQuantity - sunNum > 0 ? item.planQuantity - sunNum : 0,
+              color: '#F5F5F5'
-							name: '未生产',
+            })
-							color: '#F5F5F5',
+            obj.sunNum = sunNum
-						});
+            obj.order = arr3
-						obj.sunNum = sunNum;
+            arr2.push(obj)
-						obj.order = arr3;
+          })
-						arr2.push(obj);
+          this.chartList = arr2
-					});
+          if (this.activeName === 'barChart' && this.chartList.length > 0) {
-					this.chartList = arr2;
+            this.$nextTick(() => {
-					if (this.activeName === 'barChart' && this.chartList.length > 0) {
+              this.$refs.monitoringRingCharts.initChart()
-						this.$nextTick(() => {
+            })
-							this.$refs.monitoringRingCharts.initChart();
+          }
-						});
+        } else {
-					}
+          // 显示无数据的图片
-				} else {
+          this.chartList = []
-					// 显示无数据的图片
+        }
-					this.chartList = [];
+        console.log(arr)
-				}
+        this.list = arr
-				console.log(arr);
+      })
-				this.list = arr;
+    },
-			});
+    // 查询
-		},
+    buttonClick(val) {
-		// 查询
+      this.queryParams.name = val.name
-		buttonClick(val) {
+      if (val.timeVal && val.timeVal.length > 0) {
-			this.queryParams.name = val.name;
+        this.queryParams.deliveTime[0] = val.timeVal[0] + ' 00:00:00'
-			if (val.timeVal && val.timeVal.length > 0) {
+        this.queryParams.deliveTime[1] = val.timeVal[1] + ' 23:59:59'
-				this.queryParams.deliveTime[0] = val.timeVal[0] + ' 00:00:00';
+      } else {
-				this.queryParams.deliveTime[1] = val.timeVal[1] + ' 23:59:59';
+        this.queryParams.deliveTime = []
-			} else {
+      }
-				this.queryParams.deliveTime = [];
+      this.getPage()
-			}
+    },
-			this.getPage();
+    handleClick(val) {
-		},
+      console.log(val)
-		handleClick(val) {
+      switch (val.type) {
-			console.log(val);
+        case 'orderDetail':
-			switch (val.type) {
+          if (val.data.orderType === '集团订单') {
-				case 'orderDetail':
+            this.$router.push({// 去厂务订单详情
-					if (val.data.orderType === '集团订单') {
+              path: '/order/base/order-manage/order-detail-data?orderIdString=' + val.data.orderIds.join(',')
-						this.$router.push({
+            })
-							// 去厂务订单详情
+          } else {
-							path:
+            this.$router.push({// 去工单详情
-								'/order/base/order-manage/order-detail-data?orderIdString=' +
+              path: '/core/core-work-order-detail?woIdString=' + val.data.woIdString
-								val.data.orderIds.join(','),
+            })
-						});
+          }
-					} else {
+          break
-						this.$router.push({
+        case 'qualityDetail':
-							// 去工单详情
+          this.$router.push({
-							path:
+            path: '/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString=' + val.data.woIdString
-								'/core/core-work-order-detail?woIdString=' +
+          })
-								val.data.woIdString,
+          break
-						});
+        default:
-					}
+        // this.$router.push({
-					break;
+        //   path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
-				case 'qualityDetail':
+        // })
-					this.$router.push({
+      }
-						path:
+    },
-							'/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString=' +
+    toggleTab() {
-							val.data.woIdString,
+      if (this.activeName === 'barChart' && this.chartList.length > 0) {
-					});
+        this.$nextTick(() => {
-					break;
+          this.$refs.monitoringRingCharts.initChart()
-				default:
+        })
-				// this.$router.push({
+      }
-				//   path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
+    }
-				// })
+  }
-			}
+}
-		},
-		toggleTab() {
-			if (this.activeName === 'barChart' && this.chartList.length > 0) {
-				this.$nextTick(() => {
-					this.$refs.monitoringRingCharts.initChart();
-				});
-			}
-		},
-	},
-};
 </script>
 <style lang='scss'>
 .orderMonitoring {
-	.el-tabs__nav::after {
+  .el-tabs__nav::after {
-		content: '';
+    content: "";
-		position: absolute;
+    position: absolute;
-		left: 0;
+    left: 0;
-		bottom: 0;
+    bottom: 0;
-		width: 100%;
+    width: 100%;
-		height: 2px;
+    height: 2px;
-		background-color: #e4e7ed;
+    background-color: #e4e7ed;
-	}
+  }
 
-	.el-tabs__nav-wrap::after {
+  .el-tabs__nav-wrap::after {
-		width: 0;
+    width: 0;
-	}
+  }
 
-	.el-tabs__item {
+  .el-tabs__item {
-		padding: 0 10px;
+    padding: 0 10px;
-	}
+  }
 
-	.el-tabs__item:hover {
+  .el-tabs__item:hover {
-		color: rgba(0, 0, 0, 0.85);
+    color: rgba(0, 0, 0, 0.85);
-	}
+  }
 
-	.el-tabs__item.is-active {
+  .el-tabs__item.is-active {
-		color: rgba(0, 0, 0, 0.85);
+    color: rgba(0, 0, 0, 0.85);
-	}
+  }
 
-	.el-tabs__item {
+  .el-tabs__item {
-		color: rgba(0, 0, 0, 0.45);
+    color: rgba(0, 0, 0, 0.45);
-	}
+  }
 
-	.searchBarBox {
+  .searchBarBox {
-		margin-bottom: 0;
+    margin-bottom: 0;
-	}
+  }
 
-	.boxTitle {
+  .boxTitle {
-		display: inline-block;
+    display: inline-block;
-		font-size: 16px;
+    font-size: 16px;
-		font-weight: 400;
+    font-weight: 400;
-		color: #000000;
+    color: #000000;
-		margin: 0 10px 16px 0;
+    margin: 0 10px 16px 0;
-	}
+  }
 
-	.blueTitle {
+  .blueTitle {
-		content: '';
+    content: '';
-		display: inline-block;
+    display: inline-block;
-		width: 4px;
+    width: 4px;
-		height: 18px;
+    height: 18px;
-		background-color: #0b58ff;
+    background-color: #0B58FF;
-		border-radius: 1px;
+    border-radius: 1px;
-		margin-right: 8px;
+    margin-right: 8px;
-		vertical-align: bottom;
+    vertical-align: bottom;
-	}
+  }
 }
 </style>

src/views/quality/base/qualityHotMaterial/index.vue

@@ -135,7 +135,7 @@ export default {
           width: 250
         },
 				{
-          type: this.$auth.hasPermi('base:quality-hot-material:query') ? 'button' : '',
+					type: 'button',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
@@ -144,7 +144,7 @@ export default {
 					type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'button' : '',
+          type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',

src/views/quality/base/qualityIsra/index.vue

@@ -131,7 +131,7 @@ export default {
 					// width: 350,
 				},
 				{
-          type: this.$auth.hasPermi('base:quality-isra-statistics:query') ? 'button' : '',
+          type: this.$auth.hasPermi('	base: quality - isra - statistics: query') ? 'button' : '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
@@ -207,16 +207,15 @@ export default {
       }).then((res) => {
         let mapArr= []
         let mapLegendData = []
-        let obj = {
-          name: '',
-          type: 'line',
-          // stack: 'Total',
-          data: [],
-          mapXAxisData: [],
-        }
         // let mapXAxisData = []
         for (let i in res.data) {
-
+          let obj = {
+            name: '',
+            type: 'line',
+            // stack: 'Total',
+            data: [],
+            mapXAxisData:[],
+          }
           // console.log(i)
           let dataArr = []
           res.data[i].forEach(ele => {
@@ -228,7 +227,6 @@ export default {
           mapLegendData.push(i)
           mapArr.push(obj)
         }
-        console.log(mapArr);
         // console.log(res.data[res]);
         var chartDom = this.activeName === 'day' ? document.getElementById('mapDayMain') : this.activeName === 'week' ? document.getElementById('mapWeekMain') : document.getElementById('mapMonthMain')
         var myChart = echarts.init(chartDom);
@@ -269,7 +267,6 @@ export default {
           },
           series: mapArr
         }
-        myChart.clear()
         option && myChart.setOption(option);
       })
       this.$axios({
@@ -377,7 +374,6 @@ export default {
             }
           ]
         }
-        myChart.clear()
         option && myChart.setOption(option);
       })
     },

src/views/quality/base/qualityScrapLog/index.vue

@@ -119,7 +119,7 @@ export default {
         //   filterable: true
         // },
 				{
-          type: this.$auth.hasPermi('base:quality-scrap-det:query') ? 'button' : '',
+					type: 'button',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',

src/views/quality/monitoring/deviceParameters/index.vue

@@ -218,11 +218,7 @@ export default {
           width: 350,
         },
         {
-            type: this.$auth.hasPermi(
+          type: 'button',
-              'monitoring:device-parameters:query'
-            )
-            ? 'button'
-            : '',
           btnName: '查询',
           name: 'search',
           color: 'primary',

src/views/quality/monitoring/equipmentTraceability/index.vue

@@ -260,24 +260,17 @@ export default {
 				// 	],
 				// },
 				{
-          type: this.$auth.hasPermi(
+					type: 'button',
-            'monitoring:equipment-traceability:query'
-          )
-            ? 'button'
-            : '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
         },
         {
-          type: this.$auth.hasPermi(
+        	type: 'button',
-            'monitoring:equipment-traceability:export'
-          )
-            ? 'button'
-            : '',
         	btnName: '导出',
         	name: 'export',
         	color: 'warning',
+
         },
 				// {
 				// 	type: 'separate',

src/views/quality/monitoring/materielDateFrom/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-07 16:19:18
+ * @LastEditTime: 2024-03-29 14:08:18
  * @Description:
 -->
 <template>
@@ -84,21 +84,21 @@ export default {
       // },
       tableProps,
       // tableH: this.tableHeight(260),
-      // tableBtn: [
+      tableBtn: [
-      //   this.$auth.hasPermi(`base:packaging-print-log:update`)
+        this.$auth.hasPermi(`base:packaging-print-log:update`)
-      //     ? {
+          ? {
-      //       type: 'edit',
+            type: 'edit',
-      //       btnName: '编辑',
+            btnName: '编辑',
-      //     }
+          }
-      //     : undefined,
+          : undefined,
-      //   this.$auth.hasPermi(`base:packaging-print-log:delete`)
+        this.$auth.hasPermi(`base:packaging-print-log:delete`)
-      //     ? {
+          ? {
-      //       type: 'delete',
+            type: 'delete',
-      //       btnName: '删除',
+            btnName: '删除',
-      //     }
+          }
-      //     : undefined,
+          : undefined,
 
-      // ].filter((v) => v),
+      ].filter((v) => v),
       list: [],
       listQuery: {
         pageSize: 10,
@@ -131,7 +131,7 @@ export default {
           width: 250
         },
         {
-          type: this.$auth.hasPermi('monitoring:materiel-date-from:query') ? 'button' : '',
+          type: 'button',
           btnName: '查询',
           name: 'search',
           color: 'primary',

src/views/quality/monitoring/originalGlassRetrace/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-07 16:25:19
+ * @LastEditTime: 2024-03-29 14:08:30
  * @Description:
 -->
 <template>
@@ -147,8 +147,7 @@ export default {
         //   width: 250
         // },
         {
-
+          type: 'button',
-          type: this.$auth.hasPermi('monitoring:rawMaterial-traceability:query') ? 'button' : '',
           btnName: '查询',
           name: 'search',
           color: 'primary',

src/views/quality/monitoring/processTraceability/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-07 16:26:56
+ * @LastEditTime: 2024-03-29 15:32:33
  * @Description:
 -->
 <template>
@@ -135,12 +135,7 @@ export default {
           width: 250
         },
         {
-
+          type: 'button',
-       	 type: this.$auth.hasPermi(
-            'monitoring:process-traceability:query'
-          )
-            ? 'button'
-            : '',
           btnName: '查询',
           name: 'search',
           color: 'primary',

src/views/quality/monitoring/qualityInspectionRecord/index.vue

@@ -159,11 +159,7 @@ export default {
 					// width: 350,
 				},
 				{
-          type: this.$auth.hasPermi(
+					type: 'button',
-            'base:quality-inspection-record:query'
-          )
-            ? 'button'
-            : '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',

src/views/report/glass/day.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-24 15:15:24
- * @LastEditTime: 2024-04-08 11:47:39
+ * @LastEditTime: 2024-03-27 09:27:23
  * @LastEditors: zhp
  * @Description:
 -->
@@ -18,8 +18,8 @@
         <el-form-item>
           <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
             @click="getDataList">查询</el-button>
-          <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
+          <el-button v-if="this.$auth.hasPermi('report:glass-day:export')" type="primary" size="small" plain
-            plain @click="handleExport">导出</el-button>
+            @click="handleExport">导出</el-button>
         </el-form-item>
       </el-form>
     </div>

src/views/report/glass/month.vue

@@ -9,8 +9,8 @@
         <el-form-item>
           <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
             @click="getDataList">查询</el-button>
-          <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
+          <el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain
-            plain @click="handleExport">导出</el-button>
+            @click="handleExport">导出</el-button>
         </el-form-item>
       </el-form>
     </div>

src/views/report/glass/weekly.vue

@@ -16,8 +16,8 @@
         <el-form-item>
           <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
             @click="getDataList">查询</el-button>
-          <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
+          <el-button v-if="this.$auth.hasPermi('report:glass-weekly:export')" type="primary" size="small" plain
-            plain @click="handleExport">导出</el-button>
+            @click="handleExport">导出</el-button>
         </el-form-item>
       </el-form>
     </div>

src/views/report/glass/year.vue

@@ -11,8 +11,8 @@
         <el-form-item>
           <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
             @click="getDataList">查询</el-button>
-          <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
+          <el-button v-if="this.$auth.hasPermi('report:glass-year:export')" type="primary" size="small" plain
-            plain @click="handleExport">导出</el-button>
+            @click="handleExport">导出</el-button>
         </el-form-item>
       </el-form>
     </div>

src/views/report/productionMonthReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-08 11:45:52
+ * @LastEditTime: 2024-03-29 09:48:32
  * @LastEditors: zhp
  * @Description:
 -->
@@ -12,9 +12,8 @@
         <el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
         </el-date-picker>
       </el-form-item>
-      <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
+      <el-button type="primary" @click="getDataList()">查询</el-button>
-      </el-button>
+      <el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain
-      <el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
         @click="handleExport">导出</el-button>
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
@@ -29,122 +28,122 @@
       <el-table-column :label="'许昌安彩月成品生产汇总' + '(' + timeTips + ')'" align="center">
         <el-table-column prop="lineId" label="生产线" align="center">
           <template slot-scope="scope">
-            <el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
+            <el-input  v-if="!disabled"  type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
             <span v-else>{{ scope.row.lineName }} </span>
           </template>
         </el-table-column>
         <el-table-column label="投入数㎡" align="center">
           <el-table-column prop="inputNow" label="本月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputHis" label="上月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputTrend" label="增减" align="center">
             <template slot-scope="scope">
 
-              <el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
               <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
-                parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 :
+              parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 :
-                null
+              null
-                }} </span>
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="完成良品产量" align="center">
           <el-table-column prop="goodProductNow" label="本月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductHis" label="上月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
-                parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
+              parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
-                null
+              null
-                }} </span>
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="原片漏检率" align="center">
           <el-table-column prop="missCheckNow" label="本月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
-                100).toFixed(2)) +
+              100).toFixed(2)) +
-                '%' : null }}
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="missCheckHis" label="上月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
-                100).toFixed(2)) +
+              100).toFixed(2)) +
-                '%' : null }}
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="missCheckTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
-                parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ?
+              parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ?
-                0 :
+              0 :
-                null
+              null
-                }} </span>
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="综合良品率" align="center">
           <el-table-column prop="goodProductPassNow" label="本月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
-                100).toFixed(2)) +
+              100).toFixed(2)) +
-                '%' : null }}
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductPassHis" label="上月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
-                100).toFixed(2)) +
+              100).toFixed(2)) +
-                '%' : null }}
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductPassTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
                 parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
-                0 ?
+              0 ?
-                0 :
+              0 :
-                null
+              null
-                }} </span>
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>

src/views/report/productionWeekReport/index.vue

@@ -14,9 +14,9 @@
           style="width: 350px" placeholder="选择周">
         </el-date-picker>
       </el-form-item>
-      <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
+      <el-button type="primary" @click="getDataList()">查询</el-button>
-      </el-button>
+      <!-- <el-button type="primary" @click="getDataList()">查询</el-button> -->
-      <el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
+      <el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain
         @click="handleExport">导出</el-button>
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
@@ -31,126 +31,126 @@
       <el-table-column :label="'许昌安彩周成品生产汇总' + '(' + timeTips + ')'" align="center">
         <el-table-column prop="lineId" label="生产线" align="center">
           <template slot-scope="scope">
-            <el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
+            <el-input  v-if="!disabled"  type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
             <span v-else>{{ scope.row.lineName }} </span>
           </template>
         </el-table-column>
         <el-table-column label="投入数㎡" align="center">
           <el-table-column prop="inputNow" label="本周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputHis" label="上周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
               <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
-                parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
+              parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
-                0 ?
+              0 ?
-                0 :
+              0 :
-                null
+              null
-                }} </span>
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="完成良品产量" align="center">
           <el-table-column prop="goodProductNow" label="本周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductHis" label="上周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
-                parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
+              parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
-                0 ?
+              0 ?
-                0 :
+              0 :
-                null
+              null
-                }} </span>
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="原片漏检率" align="center">
           <el-table-column prop="missCheckNow" label="本周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
-                100).toFixed(2)) +
+              100).toFixed(2)) +
-                '%' : null }}
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="missCheckHis" label="上周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
-                100).toFixed(2)) +
+              100).toFixed(2)) +
-                '%' : null }}
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="missCheckTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
-                parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
+              parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
-                0 ?
+              0 ?
-                0 :
+              0 :
-                null
+              null
-                }} </span>
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="综合良品率" align="center">
           <el-table-column prop="goodProductPassNow" label="本周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
-                100).toFixed(2)) +
+              100).toFixed(2)) +
-                '%' : null }}
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductPassHis" label="上周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
-                100).toFixed(2)) +
+              100).toFixed(2)) +
-                '%' : null }}
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductPassTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
                 parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
-                0 ?
+              0 ?
-                0 :
+              0 :
-                null
+              null
-                }} </span>
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>

src/views/report/productionYearReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-08 11:46:49
+ * @LastEditTime: 2024-03-29 09:48:49
  * @LastEditors: zhp
  * @Description:
 -->
@@ -14,9 +14,8 @@
           style="width: 350px" placeholder="选择年">
         </el-date-picker>
       </el-form-item>
-      <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
+      <el-button type="primary" @click="getDataList()">查询</el-button>
-      </el-button>
+      <el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain
-      <el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
         @click="handleExport">导出</el-button>
       <!-- <el-button type="primary" icon="el-icon-edit-outline" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" type="success" @click="saveDataList()">保存</el-button> -->
@@ -34,126 +33,126 @@
       <el-table-column :label="'许昌安彩年成品生产汇总' + '(' + timeTips + ')'" align="center">
         <el-table-column prop="lineId" label="生产线" align="center">
           <template slot-scope="scope">
-            <el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
+            <el-input  v-if="!disabled"  type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
             <span v-else>{{ scope.row.lineName }} </span>
           </template>
         </el-table-column>
         <el-table-column label="投入数㎡" align="center">
           <el-table-column prop="inputNow" label="今年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputHis" label="去年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
               <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
-                parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
+              parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
-                0 ?
+              0 ?
-                0 :
+              0 :
-                null
+              null
-                }} </span>
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="完成良品产量" align="center">
           <el-table-column prop="goodProductNow" label="今年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductHis" label="去年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
-                parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
+              parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
-                0 ?
+              0 ?
-                0 :
+              0 :
-                null
+              null
-                }} </span>
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="原片漏检率" align="center">
           <el-table-column prop="missCheckNow" label="今年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
-                100).toFixed(2)) +
+              100).toFixed(2)) +
-                '%' : null }}
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="missCheckHis" label="去年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
-                100).toFixed(2)) +
+              100).toFixed(2)) +
-                '%' : null }}
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="missCheckTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
-                parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
+              parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
-                0 ?
+              0 ?
-                0 :
+              0 :
-                null
+              null
-                }} </span>
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="综合良品率" align="center">
           <el-table-column prop="goodProductPassNow" label="今年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
-                100).toFixed(2)) +
+              100).toFixed(2)) +
-                '%' : null }}
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductPassHis" label="去年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
-                100).toFixed(2)) +
+              100).toFixed(2)) +
-                '%' : null }}
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductPassTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
                 parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
-                0 ?
+              0 ?
-                0 :
+              0 :
-                null
+              null
-                }} </span>
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>

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

@@ -1,188 +1,185 @@
 <template>
-	<div class="app-container vocHis">
+  <div class="app-container vocHis">
-		<!-- 搜索工作栏 -->
+    <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar
-			:formConfigs="formConfig"
+      :formConfigs="formConfig"
-			ref="searchBarForm"
+      ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+      @headBtnClick="buttonClick"
-		<!-- 列表 -->
+    />
-		<base-table
+    <!-- 列表 -->
-			:page="queryParams.pageNo"
+    <base-table
-			:limit="queryParams.pageSize"
+      :page="queryParams.pageNo"
-			:table-props="tableProps"
+      :limit="queryParams.pageSize"
-			:table-data="list"
+      :table-props="tableProps"
-			:max-height="tableH"
+      :table-data="list"
-			:row-class-name="tableRowClassName" />
+      :max-height="tableH"
-		<pagination
+      :row-class-name="tableRowClassName"
-			:page.sync="queryParams.pageNo"
+    />
-			:limit.sync="queryParams.pageSize"
+    <pagination
-			:total="total"
+      :page.sync="queryParams.pageNo"
-			@pagination="getList" />
+      :limit.sync="queryParams.pageSize"
-	</div>
+      :total="total"
+      @pagination="getList"
+    />
+  </div>
 </template>
 <script>
-import { publicFormatter } from '@/utils/dict';
+import { publicFormatter } from '@/utils/dict'
-import { parseTime } from '@/utils/ruoyi';
+import { parseTime } from '@/utils/ruoyi'
-import {
+import { environmentalCheckRecordPage, environmentalCheckRecordExport, environmentalCheckPage } from '@/api/safetyEnvironmental/environmental'
-	environmentalCheckRecordPage,
+import moment from 'moment'
-	environmentalCheckRecordExport,
-	environmentalCheckPage,
-} from '@/api/safetyEnvironmental/environmental';
-import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'checkName',
+    prop: 'checkName',
-		label: '指标名称',
+    label: '指标名称'
-	},
+  },
-	{
+  {
-		prop: 'checkValue',
+    prop: 'checkValue',
-		label: '检测数值',
+    label: '检测数值'
-	},
+  },
-	{
+  {
-		prop: 'unit',
+    prop: 'unit',
-		label: '单位',
+    label: '单位',
-		filter: publicFormatter('environment_check_unit'),
+    filter: publicFormatter('environment_check_unit')
-	},
+  },
-	{
+  {
-		prop: 'checkTime',
+    prop: 'checkTime',
-		label: '检测时间',
+    label: '检测时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'origin',
+    prop: 'origin',
-		label: '来源',
+    label: '来源',
-		filter: (val) => ['手动', '自动'][val],
+    filter: (val) => ['手动', '自动'][val]
-	},
+  },
-	{
+  {
-		prop: 'recordPerson',
+    prop: 'recordPerson',
-		label: '录入人',
+    label: '录入人'
-	},
+  },
-	{
+  {
-		prop: 'recordTime',
+    prop: 'recordTime',
-		label: '录入时间',
+    label: '录入时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  }
-];
+]
 export default {
-	name: 'VocDetectionHistory',
+  name: 'VocDetectionHistory',
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'select',
-					type: 'select',
+          label: '指标名称',
-					label: '指标名称',
+          selectOptions: [],
-					selectOptions: [],
+          param: 'checkId',
-					param: 'checkId',
+          filterable: true
-					filterable: true,
+        },
-				},
+        {
-				{
+          type: 'datePicker',
-					type: 'datePicker',
+          label: '时间',
-					label: '时间',
+          dateType: 'datetimerange',
-					dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
-					format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: "timestamp",
-					valueFormat: 'timestamp',
+          rangeSeparator: '-',
-					rangeSeparator: '-',
+          startPlaceholder: '开始时间',
-					startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
-					endPlaceholder: '结束时间',
+          param: 'timeVal',
-					param: 'timeVal',
+          defaultSelect: [],
-					defaultSelect: [],
+          width: 350
-					width: 350,
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:voc:export') ? 'separate' : '',
-					type: this.$auth.hasPermi('base:voc:export') ? 'separate' : '',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:voc:export') ? 'button' : '',
-					type: this.$auth.hasPermi('base:voc:export') ? 'button' : '',
+          btnName: '导出',
-					btnName: '导出',
+          name: 'export',
-					name: 'export',
+          color: 'primary',
-					color: 'primary',
+          plain: true
-					plain: true,
+        }
-				},
+      ],
-			],
+      // 查询参数
-			// 查询参数
+      queryParams: {
-			queryParams: {
+        pageNo: 1,
-				pageNo: 1,
+        pageSize: 20,
-				pageSize: 20,
+        checkId: null,
-				checkId: null,
+        checkType: 3,
-				checkType: 3,
+        startTime: null,
-				startTime: null,
+        endTime: null
-				endTime: null,
+      },
-			},
+      tableProps,
-			tableProps,
+      list: [],
-			list: [],
+      total: 0,
-			total: 0,
+      tableH: this.tableHeight(260)
-		};
+    }
-	},
+  },
-	created() {
+  created() {
-		let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf();
+    window.addEventListener('resize', () => {
-		let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf();
+      this.tableH = this.tableHeight(260)
-		this.formConfig[1].defaultSelect = [start, end];
+    })
-		this.queryParams.startTime = start;
+    let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf()
-		this.queryParams.endTime = end;
+    let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf()
-		this.getSelectList();
+    this.formConfig[1].defaultSelect = [start, end]
-		this.getList();
+    this.queryParams.startTime = start
-	},
+    this.queryParams.endTime = end
-	methods: {
+    this.getSelectList()
-		buttonClick(val) {
+    this.getList()
-			this.queryParams.pageNo = 1;
+  },
-			this.queryParams.checkId = val.checkId;
+  methods: {
-			this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
+    buttonClick(val) {
-			this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
+      this.queryParams.pageNo = 1;
-			if (val.btnName === 'search') {
+      this.queryParams.checkId = val.checkId
-				this.getList();
+      this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
-			} else {
+      this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
-				this.$modal
+      if (val.btnName === 'search') {
-					.confirm('是否确认导出')
+        this.getList()
-					.then(() => {
+      } else {
-						return environmentalCheckRecordExport({ ...this.queryParams });
+        this.$modal.confirm('是否确认导出').then(() => {
-					})
+            return environmentalCheckRecordExport({...this.queryParams});
-					.then((response) => {
+          }).then(response => {
-						this.$download.excel(response, '废水检测历史记录.xls');
+            this.$download.excel(response, '废水检测历史记录.xls');
-					})
+          }).catch(() => {})
-					.catch(() => {});
+      }
-			}
+    },
-		},
+    getList() {
-		getList() {
+      environmentalCheckRecordPage({...this.queryParams}).then(res => {
-			environmentalCheckRecordPage({ ...this.queryParams }).then((res) => {
+        this.list = res.data.list || []
-				this.list = res.data.list || [];
+        this.total = res.data.total || 0
-				this.total = res.data.total || 0;
+      })
-			});
+    },
-		},
+    getSelectList() {
-		getSelectList() {
+      environmentalCheckPage({
-			environmentalCheckPage({
+        pageNo: 1,
-				pageNo: 1,
+        pageSize: 100,
-				pageSize: 100,
+        checkType: 3
-				checkType: 3,
+      }).then(res => {
-			}).then((res) => {
+        console.log(res)
-				console.log(res);
+        this.formConfig[0].selectOptions = res.data.list || []
-				this.formConfig[0].selectOptions = res.data.list || [];
+      })
-			});
+    },
-		},
+    tableRowClassName({row, rowIndex}) {
-		tableRowClassName({ row, rowIndex }) {
+      console.log(row)
-			console.log(row);
+      if (row.markRed) {
-			if (row.markRed) {
+        return 'warning-row'
-				return 'warning-row';
+      }else {
-			} else {
+        return ''
-				return '';
+      }
-			}
+    }
-		},
+  }
-	},
+}
-};
 </script>
 <style lang='scss'>
 .vocHis {
-	.el-table .warning-row {
+  .el-table .warning-row {
-		background: #fee1e1;
+    background: #fee1e1;
-	}
+  }
 }
 </style>

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

@@ -1,210 +1,205 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
+    <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar
-			:formConfigs="formConfig"
+      :formConfigs="formConfig"
-			ref="searchBarForm"
+      ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+      @headBtnClick="buttonClick"
-		<!-- 列表 -->
+    />
-		<base-table
+    <!-- 列表 -->
-			:page="queryParams.pageNo"
+    <base-table
-			:limit="queryParams.pageSize"
+      :page="queryParams.pageNo"
-			:table-props="tableProps"
+      :limit="queryParams.pageSize"
-			:table-data="list"
+      :table-props="tableProps"
-			:max-height="tableH">
+      :table-data="list"
-			<method-btn
+      :max-height="tableH"
-				v-if="tableBtn.length"
+    >
-				slot="handleBtn"
+      <method-btn
-				:width="80"
+        v-if="tableBtn.length"
-				label="操作"
+        slot="handleBtn"
-				:method-list="tableBtn"
+        :width="80"
-				@clickBtn="handleClick" />
+        label="操作"
-		</base-table>
+        :method-list="tableBtn"
-		<pagination
+        @clickBtn="handleClick"
-			:page.sync="queryParams.pageNo"
+      />
-			:limit.sync="queryParams.pageSize"
+    </base-table>
-			:total="total"
+    <pagination
-			@pagination="getList" />
+      :page.sync="queryParams.pageNo"
-		<!-- 新增&编辑 -->
+      :limit.sync="queryParams.pageSize"
-		<base-dialog
+      :total="total"
-			:dialogTitle="addOrEditTitle"
+      @pagination="getList"
-			:dialogVisible="centervisible"
+    />
-			@cancel="handleCancel"
+    <!-- 新增&编辑 -->
-			@confirm="handleConfirm"
+    <base-dialog
-			:before-close="handleCancel"
+      :dialogTitle="addOrEditTitle"
-			width="60%">
+      :dialogVisible="centervisible"
-			<voc-add
+      @cancel="handleCancel"
-				ref="vocAdd"
+      @confirm="handleConfirm"
-				@successSubmit="successSubmit" />
+      :before-close="handleCancel"
-		</base-dialog>
+      width='60%'
-	</div>
+    >
+      <voc-add ref="vocAdd" @successSubmit="successSubmit" />
+    </base-dialog>
+  </div>
 </template>
 <script>
-import { parseTime } from '@/utils/ruoyi';
+import { parseTime } from '@/utils/ruoyi'
-import VocAdd from './components/vocAdd';
+import VocAdd from './components/vocAdd'
-import { publicFormatter } from '@/utils/dict';
+import { publicFormatter } from '@/utils/dict'
-import {
+import { environmentalCheckPage, environmentalCheckDelete } from '@/api/safetyEnvironmental/environmental'
-	environmentalCheckPage,
-	environmentalCheckDelete,
-} from '@/api/safetyEnvironmental/environmental';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'name',
+    prop: 'name',
-		label: '指标名称',
+    label: '指标名称',
-		minWidth: 120,
+    minWidth: 120,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'code',
+    prop: 'code',
-		label: '指标编码',
+    label: '指标编码',
-		minWidth: 120,
+    minWidth: 120
-	},
+  },
-	{
+  {
-		prop: 'unit',
+    prop: 'unit',
-		label: '单位',
+    label: '单位',
-		filter: publicFormatter('environment_check_unit'),
+    filter: publicFormatter('environment_check_unit')
-	},
+  },
-	{
+  {
-		prop: 'minValue',
+    prop: 'minValue',
-		label: '最小值',
+    label: '最小值'
-	},
+  },
-	{
+  {
-		prop: 'maxValue',
+    prop: 'maxValue',
-		label: '最大值',
+    label: '最大值'
-	},
+  },
-	{
+  {
-		prop: 'creator',
+    prop: 'creator',
-		label: '创建人',
+    label: '创建人'
-	},
+  },
-	{
+  {
-		prop: 'createTime',
+    prop: 'createTime',
-		label: '创建时间',
+    label: '创建时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  }
-];
+]
 export default {
-	name: 'VocDetectionIndication',
+  name: 'VocDetectionIndication',
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '指标名称',
-					label: '指标名称',
+          placeholder: '指标名称',
-					placeholder: '指标名称',
+          param: 'name'
-					param: 'name',
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:voc:create') ? 'separate' : '',
-					type: this.$auth.hasPermi('base:voc:create') ? 'separate' : '',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:voc:create') ? 'button' : '',
-					type: this.$auth.hasPermi('base:voc:create') ? 'button' : '',
+          btnName: '新增',
-					btnName: '新增',
+          name: 'add',
-					name: 'add',
+          color: 'success',
-					color: 'success',
+          plain: true
-					plain: true,
+        }
-				},
+      ],
-			],
+      // 查询参数
-			// 查询参数
+      queryParams: {
-			queryParams: {
+        pageNo: 1,
-				pageNo: 1,
+        pageSize: 20,
-				pageSize: 20,
+        checkType: 3,
-				checkType: 3,
+        name: null
-				name: null,
+      },
-			},
+      total: 0,
-			total: 0,
+      tableProps,
-			tableProps,
+      list: [],
-			list: [],
+      tableH: this.tableHeight(260),
-			tableBtn: [
+      tableBtn: [
-				this.$auth.hasPermi('base:voc:update')
+        this.$auth.hasPermi('base:voc:update')
-					? {
+          ? {
-							type: 'edit',
+              type: 'edit',
-							btnName: '编辑',
+              btnName: '编辑'
-					  }
+            }
-					: undefined,
+          : undefined,
-				this.$auth.hasPermi('base:voc:delete')
+        this.$auth.hasPermi('base:voc:delete')
-					? {
+          ? {
-							type: 'delete',
+              type: 'delete',
-							btnName: '删除',
+              btnName: '删除'
-					  }
+            }
-					: undefined,
+          : undefined
-			].filter((v) => v),
+      ].filter((v)=>v),
-			addOrEditTitle: '',
+      addOrEditTitle: '',
-			centervisible: false,
+      centervisible: false
-		};
+    }
-	},
+  },
-	components: { VocAdd },
+  components: { VocAdd },
-	mounted() {
+  mounted() {
-		this.getList();
+    this.getList()
-	},
+  },
-	methods: {
+  methods: {
-		getList() {
+    getList() {
-			environmentalCheckPage({ ...this.queryParams }).then((res) => {
+      environmentalCheckPage({...this.queryParams}).then(res => {
-				this.list = res.data.list || [];
+        this.list = res.data.list || []
-				this.total = res.data.total || 0;
+        this.total = res.data.total || 0
-			});
+      })
-		},
+    },
-		buttonClick(val) {
+    buttonClick(val) {
-			console.log(val);
+      console.log(val)
-			if (val.btnName === 'search') {
+      if (val.btnName === 'search') {
-				this.queryParams.name = val.name;
+        this.queryParams.name = val.name
-				this.getList();
+        this.getList()
-			} else {
+      } else {
-				this.addOrEditTitle = '新增';
+        this.addOrEditTitle = '新增'
-				this.centervisible = true;
+        this.centervisible = true
-				this.$nextTick(() => {
+        this.$nextTick(() => {
-					this.$refs.vocAdd.init();
+          this.$refs.vocAdd.init()
-				});
+        })
-			}
+      }
-		},
+    },
-		handleClick(val) {
+    handleClick(val) {
-			console.log(val);
+      console.log(val)
-			switch (val.type) {
+      switch (val.type) {
-				case 'edit':
+        case 'edit':
-					this.addOrEditTitle = '编辑';
+          this.addOrEditTitle = '编辑'
-					this.centervisible = true;
+          this.centervisible = true
-					this.$nextTick(() => {
+          this.$nextTick(() => {
-						this.$refs.vocAdd.init(val.data.id);
+            this.$refs.vocAdd.init(val.data.id)
-					});
+          })
-					break;
+          break
-				default:
+        default:
-					this.handleDelete(val.data);
+          this.handleDelete(val.data)
-			}
+      }
-		},
+    },
-		// 删除
+    // 删除
-		handleDelete(val) {
+    handleDelete(val) {
-			this.$modal
+      this.$modal.confirm('是否确认删除"' + val.name + '"的数据项?').then(function() {
-				.confirm('是否确认删除"' + val.name + '"的数据项?')
+        return environmentalCheckDelete({ id: val.id })
-				.then(function () {
+      }).then(() => {
-					return environmentalCheckDelete({ id: val.id });
+        this.getList();
-				})
+        this.$modal.msgSuccess("操作成功");
-				.then(() => {
+      }).catch(() => {});
-					this.getList();
+    },
-					this.$modal.msgSuccess('操作成功');
+    // 新增
-				})
+    handleCancel() {
-				.catch(() => {});
+      this.$refs.vocAdd.formClear()
-		},
+      this.centervisible = false
-		// 新增
+      this.addOrEditTitle = ''
-		handleCancel() {
+    },
-			this.$refs.vocAdd.formClear();
+    handleConfirm() {
-			this.centervisible = false;
+      this.$refs.vocAdd.submitForm()
-			this.addOrEditTitle = '';
+    },
-		},
+    successSubmit() {
-		handleConfirm() {
+      this.handleCancel()
-			this.$refs.vocAdd.submitForm();
+      this.getList()
-		},
+    }
-		successSubmit() {
+  }
-			this.handleCancel();
+}
-			this.getList();
-		},
-	},
-};
 </script>

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

@@ -1,188 +1,185 @@
 <template>
-	<div class="app-container wasteGasHis">
+  <div class="app-container wasteGasHis">
-		<!-- 搜索工作栏 -->
+    <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar
-			:formConfigs="formConfig"
+      :formConfigs="formConfig"
-			ref="searchBarForm"
+      ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+      @headBtnClick="buttonClick"
-		<!-- 列表 -->
+    />
-		<base-table
+    <!-- 列表 -->
-			:page="queryParams.pageNo"
+    <base-table
-			:limit="queryParams.pageSize"
+      :page="queryParams.pageNo"
-			:table-props="tableProps"
+      :limit="queryParams.pageSize"
-			:table-data="list"
+      :table-props="tableProps"
-			:max-height="tableH"
+      :table-data="list"
-			:row-class-name="tableRowClassName" />
+      :max-height="tableH"
-		<pagination
+      :row-class-name="tableRowClassName"
-			:page.sync="queryParams.pageNo"
+    />
-			:limit.sync="queryParams.pageSize"
+    <pagination
-			:total="total"
+      :page.sync="queryParams.pageNo"
-			@pagination="getList" />
+      :limit.sync="queryParams.pageSize"
-	</div>
+      :total="total"
+      @pagination="getList"
+    />
+  </div>
 </template>
 <script>
-import { publicFormatter } from '@/utils/dict';
+import { publicFormatter } from '@/utils/dict'
-import { parseTime } from '@/utils/ruoyi';
+import { parseTime } from '@/utils/ruoyi'
-import {
+import { environmentalCheckRecordPage, environmentalCheckRecordExport, environmentalCheckPage } from '@/api/safetyEnvironmental/environmental'
-	environmentalCheckRecordPage,
+import moment from 'moment'
-	environmentalCheckRecordExport,
-	environmentalCheckPage,
-} from '@/api/safetyEnvironmental/environmental';
-import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'checkName',
+    prop: 'checkName',
-		label: '指标名称',
+    label: '指标名称'
-	},
+  },
-	{
+  {
-		prop: 'checkValue',
+    prop: 'checkValue',
-		label: '检测数值',
+    label: '检测数值'
-	},
+  },
-	{
+  {
-		prop: 'unit',
+    prop: 'unit',
-		label: '单位',
+    label: '单位',
-		filter: publicFormatter('environment_check_unit'),
+    filter: publicFormatter('environment_check_unit')
-	},
+  },
-	{
+  {
-		prop: 'checkTime',
+    prop: 'checkTime',
-		label: '检测时间',
+    label: '检测时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'origin',
+    prop: 'origin',
-		label: '来源',
+    label: '来源',
-		filter: (val) => ['手动', '自动'][val],
+    filter: (val) => ['手动', '自动'][val]
-	},
+  },
-	{
+  {
-		prop: 'recordPerson',
+    prop: 'recordPerson',
-		label: '录入人',
+    label: '录入人'
-	},
+  },
-	{
+  {
-		prop: 'recordTime',
+    prop: 'recordTime',
-		label: '录入时间',
+    label: '录入时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  }
-];
+]
 export default {
-	name: 'WasteGasDetectionHistory',
+  name: 'WasteGasDetectionHistory',
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'select',
-					type: 'select',
+          label: '指标名称',
-					label: '指标名称',
+          selectOptions: [],
-					selectOptions: [],
+          param: 'checkId',
-					param: 'checkId',
+          filterable: true
-					filterable: true,
+        },
-				},
+        {
-				{
+          type: 'datePicker',
-					type: 'datePicker',
+          label: '时间',
-					label: '时间',
+          dateType: 'datetimerange',
-					dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
-					format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: "timestamp",
-					valueFormat: 'timestamp',
+          rangeSeparator: '-',
-					rangeSeparator: '-',
+          startPlaceholder: '开始时间',
-					startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
-					endPlaceholder: '结束时间',
+          param: 'timeVal',
-					param: 'timeVal',
+          defaultSelect: [],
-					defaultSelect: [],
+          width: 350
-					width: 350,
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:waste-gas:export') ? 'separate' : '',
-					type: this.$auth.hasPermi('base:waste-gas:export') ? 'separate' : '',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:waste-gas:export') ? 'button' : '',
-					type: this.$auth.hasPermi('base:waste-gas:export') ? 'button' : '',
+          btnName: '导出',
-					btnName: '导出',
+          name: 'export',
-					name: 'export',
+          color: 'primary',
-					color: 'primary',
+          plain: true
-					plain: true,
+        }
-				},
+      ],
-			],
+      // 查询参数
-			// 查询参数
+      queryParams: {
-			queryParams: {
+        pageNo: 1,
-				pageNo: 1,
+        pageSize: 20,
-				pageSize: 20,
+        checkId: null,
-				checkId: null,
+        checkType: 2,
-				checkType: 2,
+        startTime: null,
-				startTime: null,
+        endTime: null
-				endTime: null,
+      },
-			},
+      tableProps,
-			tableProps,
+      list: [],
-			list: [],
+      total: 0,
-			total: 0,
+      tableH: this.tableHeight(260)
-		};
+    }
-	},
+  },
-	created() {
+  created() {
-		let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf();
+    window.addEventListener('resize', () => {
-		let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf();
+      this.tableH = this.tableHeight(260)
-		this.formConfig[1].defaultSelect = [start, end];
+    })
-		this.queryParams.startTime = start;
+    let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf()
-		this.queryParams.endTime = end;
+    let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf()
-		this.getSelectList();
+    this.formConfig[1].defaultSelect = [start, end]
-		this.getList();
+    this.queryParams.startTime = start
-	},
+    this.queryParams.endTime = end
-	methods: {
+    this.getSelectList()
-		buttonClick(val) {
+    this.getList()
-			this.queryParams.pageNo = 1;
+  },
-			this.queryParams.checkId = val.checkId;
+  methods: {
-			this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
+    buttonClick(val) {
-			this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
+      this.queryParams.pageNo = 1;
-			if (val.btnName === 'search') {
+      this.queryParams.checkId = val.checkId
-				this.getList();
+      this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
-			} else {
+      this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
-				this.$modal
+      if (val.btnName === 'search') {
-					.confirm('是否确认导出')
+        this.getList()
-					.then(() => {
+      } else {
-						return environmentalCheckRecordExport({ ...this.queryParams });
+        this.$modal.confirm('是否确认导出').then(() => {
-					})
+            return environmentalCheckRecordExport({...this.queryParams});
-					.then((response) => {
+          }).then(response => {
-						this.$download.excel(response, '废气检测历史记录.xls');
+            this.$download.excel(response, '废气检测历史记录.xls');
-					})
+          }).catch(() => {})
-					.catch(() => {});
+      }
-			}
+    },
-		},
+    getList() {
-		getList() {
+      environmentalCheckRecordPage({...this.queryParams}).then(res => {
-			environmentalCheckRecordPage({ ...this.queryParams }).then((res) => {
+        this.list = res.data.list || []
-				this.list = res.data.list || [];
+        this.total = res.data.total || 0
-				this.total = res.data.total || 0;
+      })
-			});
+    },
-		},
+    getSelectList() {
-		getSelectList() {
+      environmentalCheckPage({
-			environmentalCheckPage({
+        pageNo: 1,
-				pageNo: 1,
+        pageSize: 100,
-				pageSize: 100,
+        checkType: 2
-				checkType: 2,
+      }).then(res => {
-			}).then((res) => {
+        console.log(res)
-				console.log(res);
+        this.formConfig[0].selectOptions = res.data.list || []
-				this.formConfig[0].selectOptions = res.data.list || [];
+      })
-			});
+    },
-		},
+    tableRowClassName({row, rowIndex}) {
-		tableRowClassName({ row, rowIndex }) {
+      console.log(row)
-			console.log(row);
+      if (row.markRed) {
-			if (row.markRed) {
+        return 'warning-row'
-				return 'warning-row';
+      }else {
-			} else {
+        return ''
-				return '';
+      }
-			}
+    }
-		},
+  }
-	},
+}
-};
 </script>
 <style lang='scss'>
 .wasteGasHis {
-	.el-table .warning-row {
+  .el-table .warning-row {
-		background: #fee1e1;
+    background: #fee1e1;
-	}
+  }
 }
 </style>

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

@@ -1,210 +1,205 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
+    <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar
-			:formConfigs="formConfig"
+      :formConfigs="formConfig"
-			ref="searchBarForm"
+      ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+      @headBtnClick="buttonClick"
-		<!-- 列表 -->
+    />
-		<base-table
+    <!-- 列表 -->
-			:page="queryParams.pageNo"
+    <base-table
-			:limit="queryParams.pageSize"
+      :page="queryParams.pageNo"
-			:table-props="tableProps"
+      :limit="queryParams.pageSize"
-			:table-data="list"
+      :table-props="tableProps"
-			:max-height="tableH">
+      :table-data="list"
-			<method-btn
+      :max-height="tableH"
-				v-if="tableBtn.length"
+    >
-				slot="handleBtn"
+      <method-btn
-				:width="80"
+        v-if="tableBtn.length"
-				label="操作"
+        slot="handleBtn"
-				:method-list="tableBtn"
+        :width="80"
-				@clickBtn="handleClick" />
+        label="操作"
-		</base-table>
+        :method-list="tableBtn"
-		<pagination
+        @clickBtn="handleClick"
-			:page.sync="queryParams.pageNo"
+      />
-			:limit.sync="queryParams.pageSize"
+    </base-table>
-			:total="total"
+    <pagination
-			@pagination="getList" />
+      :page.sync="queryParams.pageNo"
-		<!-- 新增&编辑 -->
+      :limit.sync="queryParams.pageSize"
-		<base-dialog
+      :total="total"
-			:dialogTitle="addOrEditTitle"
+      @pagination="getList"
-			:dialogVisible="centervisible"
+    />
-			@cancel="handleCancel"
+    <!-- 新增&编辑 -->
-			@confirm="handleConfirm"
+    <base-dialog
-			:before-close="handleCancel"
+      :dialogTitle="addOrEditTitle"
-			width="60%">
+      :dialogVisible="centervisible"
-			<waste-gas-add
+      @cancel="handleCancel"
-				ref="wasteGasAdd"
+      @confirm="handleConfirm"
-				@successSubmit="successSubmit" />
+      :before-close="handleCancel"
-		</base-dialog>
+      width='60%'
-	</div>
+    >
+      <waste-gas-add ref="wasteGasAdd" @successSubmit="successSubmit" />
+    </base-dialog>
+  </div>
 </template>
 <script>
-import { parseTime } from '@/utils/ruoyi';
+import { parseTime } from '@/utils/ruoyi'
-import WasteGasAdd from './components/wasteGasAdd';
+import WasteGasAdd from './components/wasteGasAdd'
-import { publicFormatter } from '@/utils/dict';
+import { publicFormatter } from '@/utils/dict'
-import {
+import { environmentalCheckPage, environmentalCheckDelete } from '@/api/safetyEnvironmental/environmental'
-	environmentalCheckPage,
-	environmentalCheckDelete,
-} from '@/api/safetyEnvironmental/environmental';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'name',
+    prop: 'name',
-		label: '指标名称',
+    label: '指标名称',
-		minWidth: 120,
+    minWidth: 120,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'code',
+    prop: 'code',
-		label: '指标编码',
+    label: '指标编码',
-		minWidth: 120,
+    minWidth: 120
-	},
+  },
-	{
+  {
-		prop: 'unit',
+    prop: 'unit',
-		label: '单位',
+    label: '单位',
-		filter: publicFormatter('environment_check_unit'),
+    filter: publicFormatter('environment_check_unit')
-	},
+  },
-	{
+  {
-		prop: 'minValue',
+    prop: 'minValue',
-		label: '最小值',
+    label: '最小值'
-	},
+  },
-	{
+  {
-		prop: 'maxValue',
+    prop: 'maxValue',
-		label: '最大值',
+    label: '最大值'
-	},
+  },
-	{
+  {
-		prop: 'creator',
+    prop: 'creator',
-		label: '创建人',
+    label: '创建人'
-	},
+  },
-	{
+  {
-		prop: 'createTime',
+    prop: 'createTime',
-		label: '创建时间',
+    label: '创建时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  }
-];
+]
 export default {
-	name: 'WasteGasDetectionIndication',
+  name: 'WasteGasDetectionIndication',
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '指标名称',
-					label: '指标名称',
+          placeholder: '指标名称',
-					placeholder: '指标名称',
+          param: 'name'
-					param: 'name',
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:waste-gas:create') ? 'separate' : '',
-					type: this.$auth.hasPermi('base:waste-gas:create') ? 'separate' : '',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:waste-gas:create') ? 'button' : '',
-					type: this.$auth.hasPermi('base:waste-gas:create') ? 'button' : '',
+          btnName: '新增',
-					btnName: '新增',
+          name: 'add',
-					name: 'add',
+          color: 'success',
-					color: 'success',
+          plain: true
-					plain: true,
+        }
-				},
+      ],
-			],
+      // 查询参数
-			// 查询参数
+      queryParams: {
-			queryParams: {
+        pageNo: 1,
-				pageNo: 1,
+        pageSize: 20,
-				pageSize: 20,
+        checkType: 2,
-				checkType: 2,
+        name: null
-				name: null,
+      },
-			},
+      total: 0,
-			total: 0,
+      tableProps,
-			tableProps,
+      list: [],
-			list: [],
+      tableH: this.tableHeight(260),
-			tableBtn: [
+      tableBtn: [
-				this.$auth.hasPermi('base:waste-gas:update')
+        this.$auth.hasPermi('base:waste-gas:update')
-					? {
+          ? {
-							type: 'edit',
+              type: 'edit',
-							btnName: '编辑',
+              btnName: '编辑'
-					  }
+            }
-					: undefined,
+          : undefined,
-				this.$auth.hasPermi('base:waste-gas:delete')
+        this.$auth.hasPermi('base:waste-gas:delete')
-					? {
+          ? {
-							type: 'delete',
+              type: 'delete',
-							btnName: '删除',
+              btnName: '删除'
-					  }
+            }
-					: undefined,
+          : undefined
-			].filter((v) => v),
+      ].filter((v)=>v),
-			addOrEditTitle: '',
+      addOrEditTitle: '',
-			centervisible: false,
+      centervisible: false
-		};
+    }
-	},
+  },
-	components: { WasteGasAdd },
+  components: { WasteGasAdd },
-	mounted() {
+  mounted() {
-		this.getList();
+    this.getList()
-	},
+  },
-	methods: {
+  methods: {
-		getList() {
+    getList() {
-			environmentalCheckPage({ ...this.queryParams }).then((res) => {
+      environmentalCheckPage({...this.queryParams}).then(res => {
-				this.list = res.data.list || [];
+        this.list = res.data.list || []
-				this.total = res.data.total || 0;
+        this.total = res.data.total || 0
-			});
+      })
-		},
+    },
-		buttonClick(val) {
+    buttonClick(val) {
-			console.log(val);
+      console.log(val)
-			if (val.btnName === 'search') {
+      if (val.btnName === 'search') {
-				this.queryParams.name = val.name;
+        this.queryParams.name = val.name
-				this.getList();
+        this.getList()
-			} else {
+      } else {
-				this.addOrEditTitle = '新增';
+        this.addOrEditTitle = '新增'
-				this.centervisible = true;
+        this.centervisible = true
-				this.$nextTick(() => {
+        this.$nextTick(() => {
-					this.$refs.wasteGasAdd.init();
+          this.$refs.wasteGasAdd.init()
-				});
+        })
-			}
+      }
-		},
+    },
-		handleClick(val) {
+    handleClick(val) {
-			console.log(val);
+      console.log(val)
-			switch (val.type) {
+      switch (val.type) {
-				case 'edit':
+        case 'edit':
-					this.addOrEditTitle = '编辑';
+          this.addOrEditTitle = '编辑'
-					this.centervisible = true;
+          this.centervisible = true
-					this.$nextTick(() => {
+          this.$nextTick(() => {
-						this.$refs.wasteGasAdd.init(val.data.id);
+            this.$refs.wasteGasAdd.init(val.data.id)
-					});
+          })
-					break;
+          break
-				default:
+        default:
-					this.handleDelete(val.data);
+          this.handleDelete(val.data)
-			}
+      }
-		},
+    },
-		// 删除
+    // 删除
-		handleDelete(val) {
+    handleDelete(val) {
-			this.$modal
+      this.$modal.confirm('是否确认删除"' + val.name + '"的数据项?').then(function() {
-				.confirm('是否确认删除"' + val.name + '"的数据项?')
+        return environmentalCheckDelete({ id: val.id })
-				.then(function () {
+      }).then(() => {
-					return environmentalCheckDelete({ id: val.id });
+        this.getList();
-				})
+        this.$modal.msgSuccess("操作成功");
-				.then(() => {
+      }).catch(() => {});
-					this.getList();
+    },
-					this.$modal.msgSuccess('操作成功');
+    // 新增
-				})
+    handleCancel() {
-				.catch(() => {});
+      this.$refs.wasteGasAdd.formClear()
-		},
+      this.centervisible = false
-		// 新增
+      this.addOrEditTitle = ''
-		handleCancel() {
+    },
-			this.$refs.wasteGasAdd.formClear();
+    handleConfirm() {
-			this.centervisible = false;
+      this.$refs.wasteGasAdd.submitForm()
-			this.addOrEditTitle = '';
+    },
-		},
+    successSubmit() {
-		handleConfirm() {
+      this.handleCancel()
-			this.$refs.wasteGasAdd.submitForm();
+      this.getList()
-		},
+    }
-		successSubmit() {
+  }
-			this.handleCancel();
+}
-			this.getList();
-		},
-	},
-};
 </script>

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

@@ -1,190 +1,185 @@
 <template>
-	<div class="app-container wasteWaterHis">
+  <div class="app-container wasteWaterHis">
-		<!-- 搜索工作栏 -->
+    <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar
-			:formConfigs="formConfig"
+      :formConfigs="formConfig"
-			ref="searchBarForm"
+      ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+      @headBtnClick="buttonClick"
-		<!-- 列表 -->
+    />
-		<base-table
+    <!-- 列表 -->
-			:page="queryParams.pageNo"
+    <base-table
-			:limit="queryParams.pageSize"
+      :page="queryParams.pageNo"
-			:table-props="tableProps"
+      :limit="queryParams.pageSize"
-			:table-data="list"
+      :table-props="tableProps"
-			:max-height="tableH"
+      :table-data="list"
-			:row-class-name="tableRowClassName" />
+      :max-height="tableH"
-		<pagination
+      :row-class-name="tableRowClassName"
-			:page.sync="queryParams.pageNo"
+    />
-			:limit.sync="queryParams.pageSize"
+    <pagination
-			:total="total"
+      :page.sync="queryParams.pageNo"
-			@pagination="getList" />
+      :limit.sync="queryParams.pageSize"
-	</div>
+      :total="total"
+      @pagination="getList"
+    />
+  </div>
 </template>
 <script>
-import { publicFormatter } from '@/utils/dict';
+import { publicFormatter } from '@/utils/dict'
-import { parseTime } from '@/utils/ruoyi';
+import { parseTime } from '@/utils/ruoyi'
-import {
+import { environmentalCheckRecordPage, environmentalCheckRecordExport, environmentalCheckPage } from '@/api/safetyEnvironmental/environmental'
-	environmentalCheckRecordPage,
+import moment from 'moment'
-	environmentalCheckRecordExport,
-	environmentalCheckPage,
-} from '@/api/safetyEnvironmental/environmental';
-import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'checkName',
+    prop: 'checkName',
-		label: '指标名称',
+    label: '指标名称'
-	},
+  },
-	{
+  {
-		prop: 'checkValue',
+    prop: 'checkValue',
-		label: '检测数值',
+    label: '检测数值'
-	},
+  },
-	{
+  {
-		prop: 'unit',
+    prop: 'unit',
-		label: '单位',
+    label: '单位',
-		filter: publicFormatter('environment_check_unit'),
+    filter: publicFormatter('environment_check_unit')
-	},
+  },
-	{
+  {
-		prop: 'checkTime',
+    prop: 'checkTime',
-		label: '检测时间',
+    label: '检测时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  },
-	{
+  {
-		prop: 'origin',
+    prop: 'origin',
-		label: '来源',
+    label: '来源',
-		filter: (val) => ['手动', '自动'][val],
+    filter: (val) => ['手动', '自动'][val]
-	},
+  },
-	{
+  {
-		prop: 'recordPerson',
+    prop: 'recordPerson',
-		label: '录入人',
+    label: '录入人'
-	},
+  },
-	{
+  {
-		prop: 'recordTime',
+    prop: 'recordTime',
-		label: '录入时间',
+    label: '录入时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  }
-];
+]
 export default {
-	name: 'WasteWaterDetectionHistory',
+  name: 'WasteWaterDetectionHistory',
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'select',
-					type: 'select',
+          label: '指标名称',
-					label: '指标名称',
+          selectOptions: [],
-					selectOptions: [],
+          param: 'checkId',
-					param: 'checkId',
+          filterable: true
-					filterable: true,
+        },
-				},
+        {
-				{
+          type: 'datePicker',
-					type: 'datePicker',
+          label: '检测时间',
-					label: '检测时间',
+          dateType: 'datetimerange',
-					dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
-					format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: "timestamp",
-					valueFormat: 'timestamp',
+          rangeSeparator: '-',
-					rangeSeparator: '-',
+          startPlaceholder: '开始时间',
-					startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
-					endPlaceholder: '结束时间',
+          param: 'timeVal',
-					param: 'timeVal',
+          defaultSelect: [],
-					defaultSelect: [],
+          width: 350
-					width: 350,
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:waste-water:export') ? 'separate' : '',
-					type: this.$auth.hasPermi('base:waste-water:export')
+        },
-						? 'separate'
+        {
-						: '',
+          type: this.$auth.hasPermi('base:waste-water:export') ? 'button' : '',
-				},
+          btnName: '导出',
-				{
+          name: 'export',
-					type: this.$auth.hasPermi('base:waste-water:export') ? 'button' : '',
+          color: 'primary',
-					btnName: '导出',
+          plain: true
-					name: 'export',
+        }
-					color: 'primary',
+      ],
-					plain: true,
+      // 查询参数
-				},
+      queryParams: {
-			],
+        pageNo: 1,
-			// 查询参数
+        pageSize: 20,
-			queryParams: {
+        checkId: null,
-				pageNo: 1,
+        checkType: 1,
-				pageSize: 20,
+        startTime: null,
-				checkId: null,
+        endTime: null
-				checkType: 1,
+      },
-				startTime: null,
+      tableProps,
-				endTime: null,
+      list: [],
-			},
+      total: 0,
-			tableProps,
+      tableH: this.tableHeight(260)
-			list: [],
+    }
-			total: 0,
+  },
-		};
+  created() {
-	},
+    window.addEventListener('resize', () => {
-	created() {
+      this.tableH = this.tableHeight(260)
-		let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf();
+    })
-		let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf();
+    let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf()
-		this.formConfig[1].defaultSelect = [start, end];
+    let start = moment(moment().format('YYYY-MM-DD 00:00:00')).valueOf()
-		this.queryParams.startTime = start;
+    this.formConfig[1].defaultSelect = [start, end]
-		this.queryParams.endTime = end;
+    this.queryParams.startTime = start
-		this.getSelectList();
+    this.queryParams.endTime = end
-		this.getList();
+    this.getSelectList()
-	},
+    this.getList()
-	methods: {
+  },
-		buttonClick(val) {
+  methods: {
-			this.queryParams.pageNo = 1;
+    buttonClick(val) {
-			this.queryParams.checkId = val.checkId;
+      this.queryParams.pageNo = 1;
-			this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
+      this.queryParams.checkId = val.checkId
-			this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
+      this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
-			if (val.btnName === 'search') {
+      this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
-				this.getList();
+      if (val.btnName === 'search') {
-			} else {
+        this.getList()
-				this.$modal
+      } else {
-					.confirm('是否确认导出')
+        this.$modal.confirm('是否确认导出').then(() => {
-					.then(() => {
+            return environmentalCheckRecordExport({...this.queryParams});
-						return environmentalCheckRecordExport({ ...this.queryParams });
+          }).then(response => {
-					})
+            this.$download.excel(response, '废水检测历史记录.xls');
-					.then((response) => {
+          }).catch(() => {})
-						this.$download.excel(response, '废水检测历史记录.xls');
+      }
-					})
+    },
-					.catch(() => {});
+    getList() {
-			}
+      environmentalCheckRecordPage({...this.queryParams}).then(res => {
-		},
+        this.list = res.data.list || []
-		getList() {
+        this.total = res.data.total || 0
-			environmentalCheckRecordPage({ ...this.queryParams }).then((res) => {
+      })
-				this.list = res.data.list || [];
+    },
-				this.total = res.data.total || 0;
+    getSelectList() {
-			});
+      environmentalCheckPage({
-		},
+        pageNo: 1,
-		getSelectList() {
+        pageSize: 100,
-			environmentalCheckPage({
+        checkType: 1
-				pageNo: 1,
+      }).then(res => {
-				pageSize: 100,
+        console.log(res)
-				checkType: 1,
+        this.formConfig[0].selectOptions = res.data.list || []
-			}).then((res) => {
+      })
-				console.log(res);
+    },
-				this.formConfig[0].selectOptions = res.data.list || [];
+    tableRowClassName({row, rowIndex}) {
-			});
+      console.log(row)
-		},
+      if (row.markRed) {
-		tableRowClassName({ row, rowIndex }) {
+        return 'warning-row'
-			console.log(row);
+      }else {
-			if (row.markRed) {
+        return ''
-				return 'warning-row';
+      }
-			} else {
+    }
-				return '';
+  }
-			}
+}
-		},
-	},
-};
 </script>
 <style lang='scss'>
 .wasteWaterHis {
-	.el-table .warning-row {
+  .el-table .warning-row {
-		background: #fee1e1;
+    background: #fee1e1;
-	}
+  }
 }
 </style>

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

@@ -1,212 +1,205 @@
 <template>
-	<div class="app-container">
+  <div class="app-container">
-		<!-- 搜索工作栏 -->
+    <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar
-			:formConfigs="formConfig"
+      :formConfigs="formConfig"
-			ref="searchBarForm"
+      ref="searchBarForm"
-			@headBtnClick="buttonClick" />
+      @headBtnClick="buttonClick"
-		<!-- 列表 -->
+    />
-		<base-table
+    <!-- 列表 -->
-			:page="queryParams.pageNo"
+    <base-table
-			:limit="queryParams.pageSize"
+      :page="queryParams.pageNo"
-			:table-props="tableProps"
+      :limit="queryParams.pageSize"
-			:table-data="list"
+      :table-props="tableProps"
-			:max-height="tableH">
+      :table-data="list"
-			<method-btn
+      :max-height="tableH"
-				v-if="tableBtn.length"
+    >
-				slot="handleBtn"
+      <method-btn
-				:width="80"
+        v-if="tableBtn.length"
-				label="操作"
+        slot="handleBtn"
-				:method-list="tableBtn"
+        :width="80"
-				@clickBtn="handleClick" />
+        label="操作"
-		</base-table>
+        :method-list="tableBtn"
-		<pagination
+        @clickBtn="handleClick"
-			:page.sync="queryParams.pageNo"
+      />
-			:limit.sync="queryParams.pageSize"
+    </base-table>
-			:total="total"
+    <pagination
-			@pagination="getList" />
+      :page.sync="queryParams.pageNo"
-		<!-- 新增&编辑 -->
+      :limit.sync="queryParams.pageSize"
-		<base-dialog
+      :total="total"
-			:dialogTitle="addOrEditTitle"
+      @pagination="getList"
-			:dialogVisible="centervisible"
+    />
-			@cancel="handleCancel"
+    <!-- 新增&编辑 -->
-			@confirm="handleConfirm"
+    <base-dialog
-			:before-close="handleCancel"
+      :dialogTitle="addOrEditTitle"
-			width="60%">
+      :dialogVisible="centervisible"
-			<waste-water-add
+      @cancel="handleCancel"
-				ref="wasteWaterAdd"
+      @confirm="handleConfirm"
-				@successSubmit="successSubmit" />
+      :before-close="handleCancel"
-		</base-dialog>
+      width='60%'
-	</div>
+    >
+      <waste-water-add ref="wasteWaterAdd" @successSubmit="successSubmit" />
+    </base-dialog>
+  </div>
 </template>
 <script>
-import { parseTime } from '@/utils/ruoyi';
+import { parseTime } from '@/utils/ruoyi'
-import WasteWaterAdd from './components/wasteWaterAdd';
+import WasteWaterAdd from './components/wasteWaterAdd'
-import { publicFormatter } from '@/utils/dict';
+import { publicFormatter } from '@/utils/dict'
-import {
+import { environmentalCheckPage, environmentalCheckDelete } from '@/api/safetyEnvironmental/environmental'
-	environmentalCheckPage,
-	environmentalCheckDelete,
-} from '@/api/safetyEnvironmental/environmental';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
-	{
+  {
-		prop: 'name',
+    prop: 'name',
-		label: '指标名称',
+    label: '指标名称',
-		minWidth: 120,
+    minWidth: 120,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
-	},
+  },
-	{
+  {
-		prop: 'code',
+    prop: 'code',
-		label: '指标编码',
+    label: '指标编码',
-		minWidth: 120,
+    minWidth: 120
-	},
+  },
-	{
+  {
-		prop: 'unit',
+    prop: 'unit',
-		label: '单位',
+    label: '单位',
-		filter: publicFormatter('environment_check_unit'),
+    filter: publicFormatter('environment_check_unit')
-	},
+  },
-	{
+  {
-		prop: 'minValue',
+    prop: 'minValue',
-		label: '最小值',
+    label: '最小值'
-	},
+  },
-	{
+  {
-		prop: 'maxValue',
+    prop: 'maxValue',
-		label: '最大值',
+    label: '最大值'
-	},
+  },
-	{
+  {
-		prop: 'creator',
+    prop: 'creator',
-		label: '创建人',
+    label: '创建人'
-	},
+  },
-	{
+  {
-		prop: 'createTime',
+    prop: 'createTime',
-		label: '创建时间',
+    label: '创建时间',
-		filter: parseTime,
+    filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
-	},
+  }
-];
+]
 export default {
-	name: 'WasteWaterDetectionIndication',
+  name: 'WasteWaterDetectionIndication',
-	mixins: [tableHeightMixin],
+  data() {
-	data() {
+    return {
-		return {
+      formConfig: [
-			formConfig: [
+        {
-				{
+          type: 'input',
-					type: 'input',
+          label: '指标名称',
-					label: '指标名称',
+          placeholder: '指标名称',
-					placeholder: '指标名称',
+          param: 'name'
-					param: 'name',
+        },
-				},
+        {
-				{
+          type: 'button',
-					type: 'button',
+          btnName: '查询',
-					btnName: '查询',
+          name: 'search',
-					name: 'search',
+          color: 'primary'
-					color: 'primary',
+        },
-				},
+        {
-				{
+          type: this.$auth.hasPermi('base:waste-water:create') ? 'separate' : '',
-					type: this.$auth.hasPermi('base:waste-water:create')
+        },
-						? 'separate'
+        {
-						: '',
+          type: this.$auth.hasPermi('base:waste-water:create') ? 'button' : '',
-				},
+          btnName: '新增',
-				{
+          name: 'add',
-					type: this.$auth.hasPermi('base:waste-water:create') ? 'button' : '',
+          color: 'success',
-					btnName: '新增',
+          plain: true
-					name: 'add',
+        }
-					color: 'success',
+      ],
-					plain: true,
+      // 查询参数
-				},
+      queryParams: {
-			],
+        pageNo: 1,
-			// 查询参数
+        pageSize: 20,
-			queryParams: {
+        checkType: 1,
-				pageNo: 1,
+        name: null
-				pageSize: 20,
+      },
-				checkType: 1,
+      total: 0,
-				name: null,
+      tableProps,
-			},
+      list: [],
-			total: 0,
+      tableH: this.tableHeight(260),
-			tableProps,
+      tableBtn: [
-			list: [],
+        this.$auth.hasPermi('base:waste-water:update')
-			tableBtn: [
+          ? {
-				this.$auth.hasPermi('base:waste-water:update')
+              type: 'edit',
-					? {
+              btnName: '编辑'
-							type: 'edit',
+            }
-							btnName: '编辑',
+          : undefined,
-					  }
+        this.$auth.hasPermi('base:waste-water:delete')
-					: undefined,
+          ? {
-				this.$auth.hasPermi('base:waste-water:delete')
+              type: 'delete',
-					? {
+              btnName: '删除'
-							type: 'delete',
+            }
-							btnName: '删除',
+          : undefined
-					  }
+      ].filter((v)=>v),
-					: undefined,
+      addOrEditTitle: '',
-			].filter((v) => v),
+      centervisible: false
-			addOrEditTitle: '',
+    }
-			centervisible: false,
+  },
-		};
+  components: { WasteWaterAdd },
-	},
+  mounted() {
-	components: { WasteWaterAdd },
+    this.getList()
-	mounted() {
+  },
-		this.getList();
+  methods: {
-	},
+    getList() {
-	methods: {
+      environmentalCheckPage({...this.queryParams}).then(res => {
-		getList() {
+        this.list = res.data.list || []
-			environmentalCheckPage({ ...this.queryParams }).then((res) => {
+        this.total = res.data.total || 0
-				this.list = res.data.list || [];
+      })
-				this.total = res.data.total || 0;
+    },
-			});
+    buttonClick(val) {
-		},
+      console.log(val)
-		buttonClick(val) {
+      if (val.btnName === 'search') {
-			console.log(val);
+        this.queryParams.name = val.name
-			if (val.btnName === 'search') {
+        this.getList()
-				this.queryParams.name = val.name;
+      } else {
-				this.getList();
+        this.addOrEditTitle = '新增'
-			} else {
+        this.centervisible = true
-				this.addOrEditTitle = '新增';
+        this.$nextTick(() => {
-				this.centervisible = true;
+          this.$refs.wasteWaterAdd.init()
-				this.$nextTick(() => {
+        })
-					this.$refs.wasteWaterAdd.init();
+      }
-				});
+    },
-			}
+    handleClick(val) {
-		},
+      console.log(val)
-		handleClick(val) {
+      switch (val.type) {
-			console.log(val);
+        case 'edit':
-			switch (val.type) {
+          this.addOrEditTitle = '编辑'
-				case 'edit':
+          this.centervisible = true
-					this.addOrEditTitle = '编辑';
+          this.$nextTick(() => {
-					this.centervisible = true;
+            this.$refs.wasteWaterAdd.init(val.data.id)
-					this.$nextTick(() => {
+          })
-						this.$refs.wasteWaterAdd.init(val.data.id);
+          break
-					});
+        default:
-					break;
+          this.handleDelete(val.data)
-				default:
+      }
-					this.handleDelete(val.data);
+    },
-			}
+    // 删除
-		},
+    handleDelete(val) {
-		// 删除
+      this.$modal.confirm('是否确认删除"' + val.name + '"的数据项?').then(function() {
-		handleDelete(val) {
+        return environmentalCheckDelete({ id: val.id })
-			this.$modal
+      }).then(() => {
-				.confirm('是否确认删除"' + val.name + '"的数据项?')
+        this.getList();
-				.then(function () {
+        this.$modal.msgSuccess("操作成功");
-					return environmentalCheckDelete({ id: val.id });
+      }).catch(() => {});
-				})
+    },
-				.then(() => {
+    // 新增
-					this.getList();
+    handleCancel() {
-					this.$modal.msgSuccess('操作成功');
+      this.$refs.wasteWaterAdd.formClear()
-				})
+      this.centervisible = false
-				.catch(() => {});
+      this.addOrEditTitle = ''
-		},
+    },
-		// 新增
+    handleConfirm() {
-		handleCancel() {
+      this.$refs.wasteWaterAdd.submitForm()
-			this.$refs.wasteWaterAdd.formClear();
+    },
-			this.centervisible = false;
+    successSubmit() {
-			this.addOrEditTitle = '';
+      this.handleCancel()
-		},
+      this.getList()
-		handleConfirm() {
+    }
-			this.$refs.wasteWaterAdd.submitForm();
+  }
-		},
+}
-		successSubmit() {
-			this.handleCancel();
-			this.getList();
-		},
-	},
-};
 </script>