From 7201c26792532d03b4c050a6f060d950be95f738 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 28 Nov 2023 15:46:50 +0800
Subject: [PATCH 1/5] fix bugs

---
 .env.dev                                      |   2 +-
 .../analysis/balanceAnalysis/index copy.vue   | 270 ++++++++
 .../core/analysis/balanceAnalysis/index.vue   | 599 +++++++++++-------
 .../base/alarm/Record/AddOrUpdate.vue         |   6 +-
 .../DataCollection/CollectionConfig.vue       |   4 +-
 .../DataCollection/components/BasicDrawer.vue |  49 +-
 src/views/equipment/monitor/SearchBar.vue     |   4 +
 src/views/extend/processFlow/index.vue        |   9 +-
 .../components/BomSelection.vue               |  10 +-
 .../components/ProcessBomList.vue             |  16 +
 .../components/ProcessDetail.vue              |  39 +-
 .../components/ProcessInfo.vue                |  27 +-
 12 files changed, 760 insertions(+), 275 deletions(-)
 create mode 100644 src/views/core/analysis/balanceAnalysis/index copy.vue

diff --git a/.env.dev b/.env.dev
index 962b91c1..3497fe49 100644
--- a/.env.dev
+++ b/.env.dev
@@ -16,7 +16,7 @@ VUE_APP_TITLE = MES系统
 VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.56:48082'
diff --git a/src/views/core/analysis/balanceAnalysis/index copy.vue b/src/views/core/analysis/balanceAnalysis/index copy.vue
new file mode 100644
index 00000000..7d5fca73
--- /dev/null
+++ b/src/views/core/analysis/balanceAnalysis/index copy.vue	
@@ -0,0 +1,270 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+
+		<div v-if="tableData.length">
+			<el-tabs
+				v-model="activeName"
+				@tab-click="handleTabClick"
+				style="height: 100%">
+				<el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
+					<!-- @emitFun="handleEmitFun"> -->
+					<base-table
+						v-if="mode == 'table'"
+						:span-method="mergeColumnHandler"
+						:page="1"
+						:limit="999"
+						:table-props="tableProps"
+						:table-data="tableData" />
+				</el-tab-pane>
+				<el-tab-pane :label="'\u3000产线平衡分析图\u3000'" name="graph">
+					<div class="graph" style="height: 100%">
+						<!-- graph  -->
+						<!-- <Graph
+										v-if="list.length"
+										:equipment-list="list"
+										:render="renderKey" /> -->
+						<BalanceChart ref="lineChart" />
+						<div v-if="list.length == 0" class="no-data-bg"></div>
+					</div>
+				</el-tab-pane>
+			</el-tabs>
+
+			<!-- <SearchBar :formConfigs="[{ label: '产线平衡分析图', type: 'title' }]" /> -->
+		</div>
+		<div v-else class="no-data-bg"></div>
+	</div>
+</template>
+
+<script>
+import { getCT } from '@/api/core/analysis/index';
+import { getCorePLList } from '@/api/base/coreProductionLine';
+import BalanceChart from '../balanceChart';
+
+export default {
+	components: {
+		BalanceChart,
+	},
+	// mixins: [basicPage],
+	data() {
+		return {
+			urlOptions: {
+				getDataListURL: getCT,
+			},
+			activeName: 'table',
+			tableProps: [],
+
+			tableData: [],
+			listQuery: {
+				// time: ''
+				endTime: undefined,
+				lineId: undefined,
+				startTime: undefined,
+			},
+			timeList: [],
+			spanArr: [],
+			xData: [],
+			yData: [],
+			optionArrUrl: [getCorePLList],
+			formConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					selectOptions: [],
+					param: 'lineIds',
+					defaultSelect: '',
+					multiple: false,
+					filterable: true,
+				},
+				{
+					type: 'datePicker',
+					label: '时间',
+					dateType: 'datetimerange',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					width: 350,
+					param: 'time',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+		};
+	},
+	created() {
+		this.getArr();
+	},
+	methods: {
+		handleTabClick(tab, event) {
+			if (tab.name == 'graph') this.renderKey = Math.random();
+		},
+
+		getArr() {
+			const params = {
+				page: 1,
+				limit: 500,
+			};
+			this.optionArrUrl.forEach((item, index) => {
+				item(params).then((response) => {
+					this.formConfig[index].selectOptions = response.data;
+				});
+			});
+		},
+		setRowSpan(arr) {
+			let count = 0;
+			arr.forEach((item, index) => {
+				if (index === 0) {
+					this.spanArr.push(1);
+				} else {
+					if (item === arr[index - 1]) {
+						this.spanArr[count] += 1;
+						this.spanArr.push(0);
+					} else {
+						count = index;
+						this.spanArr.push(1);
+					}
+				}
+			});
+		},
+		/** 合并table列的规则 */
+		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
+			if (columnIndex == 0) {
+				if (this.spanArr[rowIndex]) {
+					return [
+						this.spanArr[rowIndex], // row span
+						1, // col span
+					];
+				} else {
+					return [0, 0];
+				}
+			}
+		},
+		getData() {
+			// this.listQuery.lineId = '1672847052717821953'
+			// this.listQuery.startTime = '1693497600000';
+			// this.listQuery.endTime = '1693843200000';
+			this.urlOptions.getDataListURL(this.listQuery).then((res) => {
+				console.log(res);
+				let arr = [
+					{
+						prop: 'sectionName',
+						label: '工段',
+						align: 'center',
+					},
+					{
+						prop: 'equName',
+						label: '设备',
+						align: 'center',
+					},
+				];
+				let sectionArr = [];
+				res.data.data.forEach((ele, index) => {
+					let tempData = [];
+					let eqData = [];
+					let plData = [];
+					ele.data.forEach((item, index) => {
+						item.children.forEach((params) => {
+							if (params.dynamicName === '设备CT') {
+								tempData[item.dynamicName + '_eq'] = params.dynamicValue;
+								eqData[index] = params.dynamicValue;
+							} else {
+								tempData[item.dynamicName + '_pl'] = params.dynamicValue;
+								plData[index] = params.dynamicValue;
+							}
+						});
+					});
+					const equipment = {
+						name: ele.equName,
+						eqData: eqData,
+						plData: plData,
+					};
+					tempData['equName'] = ele.equName;
+					tempData['sectionName'] = ele.sectionName;
+					this.tableData.push(tempData);
+					const { sectionName } = tempData;
+					sectionArr.push(sectionName);
+					this.yData.push(equipment);
+					console.log('看看equ', this.yData);
+				});
+				this.setRowSpan(sectionArr);
+				res.data.nameData.forEach((item) => {
+					this.timeList.push(item.name);
+				});
+				const timeArray = Array.from(new Set(this.timeList));
+				for (const times of timeArray) {
+					if (times !== '设备CT' && times !== '产线CT') {
+						const subprop = {
+							label: times,
+							align: 'center',
+							children: [
+								{ prop: times + '_eq', label: '设备CT', align: 'center' },
+								{ prop: times + '_pl', label: '产线CT', align: 'center' },
+							],
+						};
+						arr.push(subprop);
+						this.xData.push(times);
+					}
+				}
+				this.tableProps = arr;
+
+				console.log('表格横坐标', this.xData, this.yData);
+				this.$nextTick(() => {
+					this.$refs.lineChart.initChart(this.xData, this.yData);
+				});
+				// this.total = response.data.total;
+				// this.dataListLoading = false;
+			});
+		},
+		buttonClick(val) {
+			// console.log(val)
+			switch (val.btnName) {
+				case 'search':
+					// this.listQuery.pageNo = 1;
+					// this.listQuery.pageSize = 10;
+					this.listQuery.lineId = val.lineIds;
+					this.listQuery.startTime = val.time
+						? String(new Date(val.time[0]).getTime())
+						: undefined;
+					this.listQuery.endTime = val.time
+						? String(new Date(val.time[1]).getTime())
+						: undefined;
+					if (val.time && val.lineIds) {
+						this.tableData = [];
+						this.xData = [];
+						this.yData = [];
+						this.tableProps = [];
+						this.spanArr = [];
+						this.timeList = [];
+						this.getData();
+					} else {
+						this.$message({
+							message: '请选择产线和时间',
+							type: 'warning',
+						});
+					}
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>
diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue
index 7adceb4a..5579da4a 100644
--- a/src/views/core/analysis/balanceAnalysis/index.vue
+++ b/src/views/core/analysis/balanceAnalysis/index.vue
@@ -1,137 +1,231 @@
 <template>
-  <div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <div v-if="tableData.length">
-      <base-table v-loading="dataListLoading" :span-method="mergeColumnHandler" :table-props="tableProps" :table-data="tableData" />
-      <SearchBar :formConfigs="[{ label: '产线平衡分析图', type: 'title' }]" />
-      <BalanceChart ref="lineChart" />
-    </div>
-    <div v-else class="no-data-bg"></div>
-    <!-- <pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" /> -->
-  </div>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- <div v-if="tableData.length"> -->
+		<el-tabs
+			v-model="activeName"
+			@tab-click="handleTabClick"
+			style="height: 100%">
+			<el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
+				<!-- @emitFun="handleEmitFun"> -->
+				<base-table
+					v-if="activeName == 'table'"
+					:span-method="mergeColumnHandler"
+					:page="1"
+					:limit="999"
+					:table-props="tableProps"
+					:table-data="tableData" />
+			</el-tab-pane>
+			<el-tab-pane :label="'\u3000产线平衡分析图\u3000'" name="graph">
+				<div class="graph" style="height: 100%">
+					<!-- graph  -->
+					<!-- <Graph
+										v-if="list.length"
+										:equipment-list="list"
+										:render="renderKey" /> -->
+					<!-- <BalanceChart ref="lineChart" /> -->
+					<div v-if="list.length == 0" class="no-data-bg"></div>
+				</div>
+			</el-tab-pane>
+		</el-tabs>
+
+		<!-- <SearchBar :formConfigs="[{ label: '产线平衡分析图', type: 'title' }]" /> -->
+		<!-- </div>
+		<div v-else class="no-data-bg"></div> -->
+	</div>
 </template>
 
 <script>
-// import basicPage from '../../mixins/basic-page';
-import { parseTime } from '../../mixins/code-filter';
-import { getCT } from '@/api/core/analysis/index';
-import { getCorePLList } from '@/api/base/coreProductionLine';
-import BalanceChart from '../balanceChart'
-import { time } from 'echarts';
-// import { getWorkshopSectionPage } from '@/api/core/base/workshopSection';
-
-// const tableProps = [
-// 	// {
-//   //   prop: 'lineName',
-// 	// 	label: '产线',
-// 	// 	align: 'center',
-// 	// },
-//   // {
-//   //   prop: 'sum',
-//   //   label: '合计',
-//   //   align: 'center',
-//   // },
-//   // {
-//   //   prop: 'dynamicValue',
-//   //   label: 'dynamicName',
-//   //   align: 'center',
-//   //   children:[
-
-//   //   ]
-//   // }
-// ];
+import BalanceChart from '../balanceChart';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
 
 export default {
-  components: {
-    BalanceChart
-  },
-  // mixins: [basicPage],
-  data() {
-    return {
-      urlOptions: {
-        getDataListURL: getCT,
-      },
-      tableProps: [],
-      dataListLoading: false,
-      tableData: [],
-      listQuery: {
-        // time: ''
-        endTime: undefined,
-        lineId:undefined,
-        startTime:undefined
-      },
-      timeList: [],
-      spanArr: [], 
-      xData: [],
-      yData: [],
-      optionArrUrl: [getCorePLList],
-      formConfig: [
-        {
-          type: 'select',
-          label: '产线',
-          selectOptions: [],
-          param: 'lineIds',
-          defaultSelect: '',
-          multiple: false,
-          filterable: true,
-        },
-        {
-          type: 'datePicker',
-          label: '时间',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          width: 350,
-          param: 'time',
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary',
-        }
-      ],
-    };
-  },
-  created() {
-    this.getArr();
-  },
-  methods: {
-    getArr() {
-      const params = {
-        page: 1,
-        limit: 500
-      }
-      this.optionArrUrl.forEach((item, index) => {
-        item(params).then((response) => {
-          this.formConfig[index].selectOptions = response.data
-        });
-      });
-    },
-    setRowSpan(arr) {
-      let count = 0
-      arr.forEach((item, index) => {
-        if(index === 0) {
-          this.spanArr.push(1)
-        } else {
-          if (item === arr[index - 1]) {
-            this.spanArr[count] += 1
-            this.spanArr.push(0)
-          } else {
-            count = index
-            this.spanArr.push(1)
-          }
-        }
-      })
-    },
-    /** 合并table列的规则 */
+	components: {
+		BalanceChart,
+	},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			activeName: 'table',
+			tableProps: [
+				{
+					prop: 'sectionName',
+					label: '工段',
+					align: 'center',
+				},
+				{
+					prop: 'equName',
+					label: '设备',
+					align: 'center',
+				},
+			],
+			tableData: [],
+			formConfig: [
+				{
+					type: 'select',
+					label: '产线',
+					selectOptions: [],
+					param: 'lineIds',
+					defaultSelect: '',
+					multiple: false,
+					filterable: true,
+				},
+				{
+					type: 'datePicker',
+					label: '时间',
+					dateType: 'monthrange',
+					format: 'yyyy-MM',
+					valueFormat: 'yyyy-MM-ddTHH:mm:ss',
+					rangeSeparator: '-',
+					startPlaceholder: '开始时间',
+					endPlaceholder: '结束时间',
+					width: 240,
+					param: 'timeArr',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+			],
+			queryParams: {
+				lineId: null,
+				startTime: null,
+				endTime: null,
+			},
+		};
+	},
+
+	mounted() {
+		this.getLine();
+	},
+
+	methods: {
+		handleTabClick(tab, event) {
+			if (tab.name == 'graph') this.renderKey = Math.random();
+		},
+
+		/** 初始化 tableProps */
+		initTableProps() {
+			this.tableProps = [
+				{
+					prop: 'sectionName',
+					label: '工段',
+					align: 'center',
+				},
+				{
+					prop: 'equName',
+					label: '设备',
+					align: 'center',
+				},
+			];
+		},
+
+		/** 获取产线 */
+		async getLine() {
+			this.formConfig[0].selectOptions = [];
+			const { code, data } = await this.http(
+				'/base/core-production-line/listAll',
+				'get'
+			);
+			if (code == 0) {
+				this.formConfig[0].selectOptions = data;
+			}
+		},
+
+		/** 获取产线平衡数据 */
+		async getCT() {
+			const { code, data } = await this.http(
+				'/analysis/equipment-analysis/getCT',
+				'post',
+				this.queryParams
+			);
+			if (code == 0) {
+				return data;
+			}
+			return { data: [], nameData: [] };
+		},
+
+		/** 解析数据 */
+		async getList() {
+			const { data, nameData } = await this.getCT();
+			await this.buildProps(nameData);
+			await this.buildTableData(data);
+			const xxxx = this.tableData;
+			debugger;
+		},
+
+		buildProps(nameData) {
+			return new Promise((resolve, reject) => {
+				const dateArr = Array.from(
+					new Set(
+						nameData
+							.map((item) => (item.tree == 1 ? item.name : undefined))
+							.filter((v) => v)
+					)
+				);
+				// 排个序
+				dateArr.sort().forEach((date) => {
+					this.tableProps.push({
+						label: date,
+						align: 'center',
+						children: [
+							{
+								prop: date + '_eq_ct',
+								label: '设备CT',
+								align: 'center',
+							},
+							{
+								prop: date + '_eq_tt',
+								label: '设备TT',
+								align: 'center',
+							},
+							{
+								prop: date + '_pl_ct',
+								label: '产线CT',
+								align: 'center',
+							},
+							{
+								prop: date + '_pl_tt',
+								label: '产线TT',
+								align: 'center',
+							},
+						],
+					});
+				});
+
+				resolve();
+			});
+		},
+
+		async buildTableData(data) {
+			/** 处理 工段 分组  */
+      const sectionList = data.map(item => {})
+		},
+
+		setRowSpan(arr) {
+			let count = 0;
+			arr.forEach((item, index) => {
+				if (index === 0) {
+					this.spanArr.push(1);
+				} else {
+					if (item === arr[index - 1]) {
+						this.spanArr[count] += 1;
+						this.spanArr.push(0);
+					} else {
+						count = index;
+						this.spanArr.push(1);
+					}
+				}
+			});
+		},
+
+		/** 合并table列的规则 */
 		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
 			if (columnIndex == 0) {
 				if (this.spanArr[rowIndex]) {
@@ -144,119 +238,142 @@ export default {
 				}
 			}
 		},
-    getData() {
-      // this.listQuery.lineId = '1672847052717821953'
-      // this.listQuery.startTime = '1693497600000';
-      // this.listQuery.endTime = '1693843200000';
-      this.urlOptions.getDataListURL(this.listQuery).then(res => {
-        console.log(res)
-        let arr = [
-          {
-            prop: 'sectionName',
-            label: '工段',
-            align: 'center',
-          },
-          {
-            prop: 'equName',
-            label: '设备',
-            align: 'center',
-          }
-        ]
-        let sectionArr= []
-        res.data.data.forEach((ele, index) => {
-          let tempData = []
-          let eqData = []
-            let plData = []
-          ele.data.forEach((item, index) => {
-            item.children.forEach(params => {
-              if (params.dynamicName === '设备CT') {
-                tempData[item.dynamicName + '_eq'] = params.dynamicValue
-                eqData[index] = params.dynamicValue
-              } else {
-                tempData[item.dynamicName + '_pl'] = params.dynamicValue
-                plData[index] = params.dynamicValue
-              }
-            })
-          })
-          const equipment = {
-            name: ele.equName,
-            eqData: eqData,
-            plData: plData
-          }
-          tempData['equName'] = ele.equName
-          tempData['sectionName'] = ele.sectionName
-          this.tableData.push(tempData)
-          const { sectionName } = tempData
-          sectionArr.push(sectionName)
-          this.yData.push(equipment)
-          console.log('看看equ', this.yData)
-        })
-        this.setRowSpan(sectionArr)
-        res.data.nameData.forEach(item => {
-          this.timeList.push(item.name)
-        })
-        const timeArray = Array.from(new Set(this.timeList))
-        for (const times of timeArray) {
-          if (times !== '设备CT' && times !== '产线CT') {
-            const subprop = {
-              label: times,
-              align: 'center',
-              children: [
-                { prop: times + '_eq', label: '设备CT', align: 'center' },
-                { prop: times + '_pl', label: '产线CT', align: 'center' }
-              ]
-            }
-            arr.push(subprop)
-            this.xData.push(times)
-          }
-        }
-        this.tableProps = arr
 
-        console.log('表格横坐标', this.xData, this.yData)
-        this.$nextTick(() => {
-          this.$refs.lineChart.initChart(this.xData, this.yData)
-        })
-        // this.total = response.data.total;
-        // this.dataListLoading = false;
-      });
-    },
-    buttonClick(val) {
-      // console.log(val)
-      switch (val.btnName) {
-        case 'search':
-          // this.listQuery.pageNo = 1;
-          // this.listQuery.pageSize = 10;
-          this.listQuery.lineId = val.lineIds
-          this.listQuery.startTime = val.time ? String(new Date(val.time[0]).getTime()) : undefined;
-          this.listQuery.endTime = val.time ? String(new Date(val.time[1]).getTime()) : undefined;
-          if (val.time && val.lineIds) {
-            this.tableData = []
-            this.xData = []
-            this.yData = []
-            this.tableProps = []
-            this.spanArr = []
-            this.timeList = []
-            this.getData()
-          } else {
-            this.$message({
-              message: '请选择产线和时间',
-              type: 'warning'
-            });
-          }
-          break;
-        case 'reset':
-          this.$refs.searchBarForm.resetForm();
-          this.listQuery = {
-            pageSize: 10,
-            pageNo: 1,
-            total: 1,
-          };
-          this.getDataList();
-          break;
-        default:
-          console.log(val);
-      }
-    },
-  },
+		getData() {
+			// this.listQuery.lineId = '1672847052717821953'
+			// this.listQuery.startTime = '1693497600000';
+			// this.listQuery.endTime = '1693843200000';
+			this.urlOptions.getDataListURL(this.listQuery).then((res) => {
+				console.log(res);
+				let arr = [
+					{
+						prop: 'sectionName',
+						label: '工段',
+						align: 'center',
+					},
+					{
+						prop: 'equName',
+						label: '设备',
+						align: 'center',
+					},
+				];
+				let sectionArr = [];
+				res.data.data.forEach((ele, index) => {
+					let tempData = [];
+					let eqData = [];
+					let plData = [];
+					ele.data.forEach((item, index) => {
+						item.children.forEach((params) => {
+							if (params.dynamicName === '设备CT') {
+								tempData[item.dynamicName + '_eq'] = params.dynamicValue;
+								eqData[index] = params.dynamicValue;
+							} else {
+								tempData[item.dynamicName + '_pl'] = params.dynamicValue;
+								plData[index] = params.dynamicValue;
+							}
+						});
+					});
+					const equipment = {
+						name: ele.equName,
+						eqData: eqData,
+						plData: plData,
+					};
+					tempData['equName'] = ele.equName;
+					tempData['sectionName'] = ele.sectionName;
+					this.tableData.push(tempData);
+					const { sectionName } = tempData;
+					sectionArr.push(sectionName);
+					this.yData.push(equipment);
+					console.log('看看equ', this.yData);
+				});
+				this.setRowSpan(sectionArr);
+				res.data.nameData.forEach((item) => {
+					this.timeList.push(item.name);
+				});
+				const timeArray = Array.from(new Set(this.timeList));
+				for (const times of timeArray) {
+					if (times !== '设备CT' && times !== '产线CT') {
+						const subprop = {
+							label: times,
+							align: 'center',
+							children: [
+								{ prop: times + '_eq', label: '设备CT', align: 'center' },
+								{ prop: times + '_pl', label: '产线CT', align: 'center' },
+							],
+						};
+						arr.push(subprop);
+						this.xData.push(times);
+					}
+				}
+				this.tableProps = arr;
+
+				console.log('表格横坐标', this.xData, this.yData);
+				this.$nextTick(() => {
+					this.$refs.lineChart.initChart(this.xData, this.yData);
+				});
+				// this.total = response.data.total;
+				// this.dataListLoading = false;
+			});
+		},
+		handleSearchBarBtnClick(btn) {
+			switch (btn.btnName) {
+				case 'search':
+					this.queryParams.lineId = btn.lineIds || null;
+					this.queryParams.startTime = btn.timeArr ? btn.timeArr[0] : null;
+					this.queryParams.endTime = btn.timeArr ? btn.timeArr[1] : null;
+
+					if (!btn.lineIds || !btn.timeArr.length) {
+						this.$message({
+							message: '请选择产线和时间',
+							type: 'warning',
+						});
+					}
+					this.getList();
+					break;
+			}
+		},
+
+		buttonClick(val) {
+			// console.log(val)
+			switch (val.btnName) {
+				case 'search':
+					// this.listQuery.pageNo = 1;
+					// this.listQuery.pageSize = 10;
+					this.listQuery.lineId = val.lineIds;
+					this.listQuery.startTime = val.time
+						? String(new Date(val.time[0]).getTime())
+						: undefined;
+					this.listQuery.endTime = val.time
+						? String(new Date(val.time[1]).getTime())
+						: undefined;
+					if (val.time && val.lineIds) {
+						this.tableData = [];
+						this.xData = [];
+						this.yData = [];
+						this.tableProps = [];
+						this.spanArr = [];
+						this.timeList = [];
+						this.getData();
+					} else {
+						this.$message({
+							message: '请选择产线和时间',
+							type: 'warning',
+						});
+					}
+					break;
+				case 'reset':
+					this.$refs.searchBarForm.resetForm();
+					this.listQuery = {
+						pageSize: 10,
+						pageNo: 1,
+						total: 1,
+					};
+					this.getDataList();
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
 };
 </script>
diff --git a/src/views/equipment/base/alarm/Record/AddOrUpdate.vue b/src/views/equipment/base/alarm/Record/AddOrUpdate.vue
index 660f3aa4..28544fe2 100644
--- a/src/views/equipment/base/alarm/Record/AddOrUpdate.vue
+++ b/src/views/equipment/base/alarm/Record/AddOrUpdate.vue
@@ -54,13 +54,15 @@ export default {
 				alarmContent: null,
 				alarmValue: null,
 				// 缺少报警编号字段, 用 alarmValue 代替
+				alarmCode: null,
+				equipmentCode: null
 			},
 			orderFormRows: [
 				[
 					{
 						input: true,
 						label: '设备编码',
-						prop: 'equipment',
+						prop: 'equipmentCode',
 					},
 					{
 						datetime: true,
@@ -70,7 +72,7 @@ export default {
 					{
 						input: true,
 						label: '报警编号',
-						prop: 'alarmValue',
+						prop: 'alarmCode',
 					},
 					{
 						input: true,
diff --git a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
index 64b25d33..abba9d4d 100644
--- a/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/CollectionConfig.vue
@@ -304,7 +304,7 @@ export default {
 					filter: publicFormatter('unit_dict'),
 				},
 				{
-					prop: 'equipment_param_type',
+					prop: 'equipmentParamType',
 					label: '设备参数类型',
 					filter: (val) =>
 						val != null
@@ -312,7 +312,7 @@ export default {
 							: '-',
 				},
 				{
-					prop: 'production_param_type',
+					prop: 'productionParamType',
 					label: '生产参数类型',
 					filter: (val) =>
 						val != null
diff --git a/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue b/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue
index 92b8039b..a2f09855 100644
--- a/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue
+++ b/src/views/equipment/base/config/DataCollection/components/BasicDrawer.vue
@@ -61,7 +61,7 @@
 									关联表名
 								</div>
 								<div class="value" style="font-size: 14px">
-									{{ form.plcTableName }}
+									{{ form.plcName }}
 								</div>
 							</el-col>
 						</el-row>
@@ -73,9 +73,17 @@
 										class="title"
 										label="设备名"
 										style="font-size: 16px; margin: 8px 0">
-										<el-input
-											v-model="form.equipmentName"
-											placeholder="请输入设备名"></el-input>
+										<el-select
+											v-model="form.equipmentId"
+											filterable
+											clearable
+											placeholder="请选择设备">
+											<el-option
+												v-for="eq in eqList"
+												:key="eq.id"
+												:label="eq.name"
+												:value="eq.id"></el-option>
+										</el-select>
 									</el-form-item>
 								</el-col>
 								<el-col :span="8">
@@ -83,9 +91,17 @@
 										class="title"
 										label="设备关联表名"
 										style="font-size: 16px; margin: 8px 0">
-										<el-input
-											v-model="form.plcTableName"
-											placeholder="请输入关联表名"></el-input>
+										<el-select
+											v-model="form.plcId"
+											filterable
+											clearable
+											placeholder="请选择关联表">
+											<el-option
+												v-for="plc in plcList"
+												:key="plc.id"
+												:label="plc.name"
+												:value="plc.id"></el-option>
+										</el-select>
 									</el-form-item>
 								</el-col>
 							</el-form>
@@ -202,6 +218,8 @@ export default {
 			total: 0,
 			form: {},
 			list: [],
+			eqList: [],
+			plcList: [],
 			attrTitle: '',
 			attrForm: {
 				id: null,
@@ -257,7 +275,7 @@ export default {
 					{
 						select: true,
 						label: '设备参数类型',
-						prop: 'equipment_param_type',
+						prop: 'equipmentParamType',
 						options: [
 							{ label: '一般参数', value: 1 },
 							{ label: '工艺参数', value: 2 },
@@ -274,7 +292,7 @@ export default {
 					{
 						select: true,
 						label: '生产参数类型',
-						prop: 'production_param_type',
+						prop: 'productionParamType',
 						options: [
 							// { label: '进片数量', value: 1 },
 							// { label: '出片数量', value: 2 },
@@ -380,6 +398,17 @@ export default {
 	mounted() {
 		this.shouldRefreshPageView = false;
 		this.mode = this.defaultMode || 'detail';
+
+		if (this.mode != 'detail') {
+			this.$axios('/base/core-equipment/listAll').then(({ code, data }) => {
+				this.eqList = data;
+			});
+			this.$axios({
+				url: '/base/equipment-plc/page',
+			}).then(({ code, data }) => {
+				this.plcList = data.list;
+			});
+		}
 		for (const section of this.sections) {
 			// 请求具体信息
 			if ('url' in section) {
@@ -479,6 +508,8 @@ export default {
 				defaultValue: '',
 				description: '',
 				remark: '',
+				equipmentParamType: '',
+				productionParamType: '',
 				alarmContent: '',
 			};
 			this.attrTitle = '添加参数绑定信息';
diff --git a/src/views/equipment/monitor/SearchBar.vue b/src/views/equipment/monitor/SearchBar.vue
index 5ecc8031..1cc50e7c 100644
--- a/src/views/equipment/monitor/SearchBar.vue
+++ b/src/views/equipment/monitor/SearchBar.vue
@@ -17,6 +17,8 @@
 				<el-select
 					size="small"
 					placeholder="请选择产线"
+					clearable 
+					filterable
 					@change="getEquipmentByLineId"
 					v-model="form.productionLineId">
 					<el-option
@@ -30,6 +32,8 @@
 				<el-select
 					size="small"
 					placeholder="请选择设备"
+					clearable 
+					filterable
 					v-model="form.equipmentId">
 					<el-option
 						v-for="item in listEq"
diff --git a/src/views/extend/processFlow/index.vue b/src/views/extend/processFlow/index.vue
index 083e48ab..9bb152da 100644
--- a/src/views/extend/processFlow/index.vue
+++ b/src/views/extend/processFlow/index.vue
@@ -279,7 +279,7 @@ export default {
 				.then(async () => {
 					const { code } = await this.http(
 						'/extend/process-flow/copy',
-						'post',
+						'get',
 						{
 							id,
 						}
@@ -333,10 +333,11 @@ export default {
 
 		async getList() {
 			this.loading = true;
-			const { code, data } = await this.recv(this.queryParams);
+			// const { code, data } = await this.recv(this.queryParams);
+			const { code, data } = await this.http('/extend/process-flow/listAll', 'get');
 			if (code == 0) {
-				this.list = data.list;
-				this.total = data.total;
+				this.list = data;
+				// this.total = data.total;
 				this.loading = false;
 				return;
 			}
diff --git a/src/views/extend/processFlowView/components/BomSelection.vue b/src/views/extend/processFlowView/components/BomSelection.vue
index 75bfa061..fbdd0219 100644
--- a/src/views/extend/processFlowView/components/BomSelection.vue
+++ b/src/views/extend/processFlowView/components/BomSelection.vue
@@ -28,7 +28,7 @@ export default {
 	// },
 	props: {
 		currentSelect: {
-			type: String,
+			type: String | Number,
 			default: null,
 		},
 		list: {
@@ -59,8 +59,16 @@ export default {
 		},
 		currentSelect: {
 			handler(val) {
+				// val: string
 				this.selected = val;
 				this.randomKey = Math.random();
+				// 更新选中状态
+				if (val) {
+					this.list__inner.forEach((item) => {
+						if (item.id == val) item.disabled = false;
+						else item.disabled = true;
+					});
+				}
 			},
 			immediate: true,
 		},
diff --git a/src/views/extend/processFlowView/components/ProcessBomList.vue b/src/views/extend/processFlowView/components/ProcessBomList.vue
index d56eb442..a086d547 100644
--- a/src/views/extend/processFlowView/components/ProcessBomList.vue
+++ b/src/views/extend/processFlowView/components/ProcessBomList.vue
@@ -77,6 +77,17 @@
 				:bom-list="bomList"
 				:value="selectedBoms"
 				@update="selectedBoms = $event" />
+
+			<el-row slot="footer">
+				<el-button size="small" @click="cancel">取消</el-button>
+				<el-button
+					type="primary"
+					size="small"
+					@click="submitForm"
+					:loading="btnLoading">
+					确定
+				</el-button>
+			</el-row>
 		</base-dialog>
 	</section>
 </template>
@@ -95,6 +106,7 @@ export default {
 	},
 	data() {
 		return {
+			btnLoading: false,
 			open: false,
 			eqList: [],
 			bomList: [],
@@ -170,6 +182,7 @@ export default {
 			});
 		},
 		submitForm() {
+			this.btnLoading = true;
 			// 现将子组件的修改提交更新至本组件
 			this.$refs.bomSelector.commit();
 			// 再提交至后端
@@ -187,11 +200,14 @@ export default {
 					if (code == 0) {
 						this.$message.success('操作成功');
 						this.getList(this.currentDet);
+						this.btnLoading = false;
 						this.cancel();
 					} else {
+						this.btnLoading = false;
 						this.$message.error('操作失败');
 					}
 				} else {
+					this.btnLoading = false;
 					this.$message.info('请选择设备');
 				}
 			});
diff --git a/src/views/extend/processFlowView/components/ProcessDetail.vue b/src/views/extend/processFlowView/components/ProcessDetail.vue
index 81d27ce9..68c0dac2 100644
--- a/src/views/extend/processFlowView/components/ProcessDetail.vue
+++ b/src/views/extend/processFlowView/components/ProcessDetail.vue
@@ -62,6 +62,16 @@
 			@cancel="cancel"
 			@confirm="submitForm">
 			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
+			<el-row slot="footer">
+				<el-button size="small" @click="cancel">取消</el-button>
+				<el-button
+					type="primary"
+					size="small"
+					@click="submitForm"
+					:loading="btnLoading">
+					确定
+				</el-button>
+			</el-row>
 		</base-dialog>
 	</section>
 </template>
@@ -102,7 +112,9 @@ export default {
 						input: true,
 						label: '工序名称',
 						prop: 'name',
-						rules: [{ required: true, message: '工序名称不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '工序名称不能为空', trigger: 'blur' },
+						],
 					},
 				],
 				[
@@ -111,7 +123,9 @@ export default {
 						label: '工段',
 						prop: 'sectionId',
 						url: '/base/core-workshop-section/listAll',
-						rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '工段不能为空', trigger: 'blur' },
+						],
 						bind: {
 							filterable: true,
 						},
@@ -139,6 +153,7 @@ export default {
 			},
 			currentDet: null,
 			currentNode: null,
+			btnLoading: false
 		};
 	},
 	watch: {
@@ -221,7 +236,7 @@ export default {
 				node.attr('container/stroke', '#0b58ff');
 				const { detId, detName, detDesc, processId, sectionId, sectionName } =
 					node.attrs;
-				console.log('node clicked!', node)
+				console.log('node clicked!', node);
 				this.currentDet = {};
 				this.$set(this.currentDet, 'detId', detId?.text);
 				this.$set(this.currentDet, 'sectionId', sectionId?.text);
@@ -354,6 +369,7 @@ export default {
 		},
 
 		handleEdit() {
+			console.log('edit: ', this.currentDet);
 			this.form.name = this.currentDet.detName;
 			this.form.sectionId = this.currentDet.sectionId;
 			this.form.remark = this.currentDet.detDesc;
@@ -379,6 +395,7 @@ export default {
 				if (!valid) {
 					return;
 				}
+				this.btnLoading = true;
 				// 修改的提交
 				if (this.form.id != null) {
 					this.updateProcess()
@@ -392,9 +409,20 @@ export default {
 									sectionName: { text: sectionName },
 									detDesc: { text: remark },
 								});
+								// 修改currentDet
+								this.currentDet = {
+									...this.currentDet,
+									detName: name,
+									sectionId: sectionId,
+									sectionName: sectionName,
+									detDesc: remark,
+								};
+								this.btnLoading = false;
 							});
 						})
-						.catch((err) => {});
+						.catch((err) => {
+							this.btnLoading = false;
+						});
 					return;
 				}
 
@@ -412,11 +440,14 @@ export default {
 					.then((node) => {
 						if (!node) {
 							this.$modal.msgError('创建节点失败');
+							this.btnLoading = false;
 							return;
 						}
+						this.btnLoading = false;
 						this.graph.addNode(node);
 					})
 					.catch((err) => {
+						this.btnLoading = false;
 						return;
 					});
 			});
diff --git a/src/views/extend/processFlowView/components/ProcessInfo.vue b/src/views/extend/processFlowView/components/ProcessInfo.vue
index 705fefba..af64dc8c 100644
--- a/src/views/extend/processFlowView/components/ProcessInfo.vue
+++ b/src/views/extend/processFlowView/components/ProcessInfo.vue
@@ -21,12 +21,12 @@
 			</el-col>
 		</el-row>
 
-		<el-row :gutter="20" style="margin-top: 12px;">
+		<el-row :gutter="20" style="margin-top: 12px">
 			<el-col :span="6">
 				<!-- <InfoItem label="创建人" value="xxse" /> -->
 			</el-col>
 			<el-col :span="6">
-				<InfoItem label="创建时间" :value="form.createTime" />
+				<InfoItem label="创建时间" :value="form.createTime" :time-format="true" />
 			</el-col>
 			<el-col :span="6">
 				<!-- <InfoItem label="更新人" value="xxse" /> -->
@@ -39,11 +39,12 @@
 </template>
 
 <script>
+import moment from 'moment';
 
 const InfoItem = {
 	name: 'InfoItem',
 	components: {},
-	props: ['label', 'value'],
+	props: ['label', 'value', 'timeFormat'],
 	data() {
 		return {};
 	},
@@ -52,9 +53,13 @@ const InfoItem = {
 	render: function (h) {
 		return (
 			<div style="display: flex; align-items: center; font-size: 14px; line-height: 1.5">
-				<span style="width: 100px; text-align: left; font-weight: 700">{this.label}:</span>
+				<span style="width: 100px; text-align: left; font-weight: 700">
+					{this.label}:
+				</span>
 				<span style="width: 200px; text-align: left; text-overflow: ellipse; white-space: nowrap">
-					{this.value}
+					{this.timeFormat
+						? moment(this.value).format('YYYY-MM-DD HH:mm:ss')
+						: this.value}
 				</span>
 			</div>
 		);
@@ -77,12 +82,12 @@ export default {
 				createTime: null,
 				remark: null,
 				enable: null,
-				code: null
+				code: null,
 			},
 		};
 	},
 	activated() {
-		this.getInfo()
+		this.getInfo();
 	},
 	computed: {},
 	methods: {
@@ -93,7 +98,7 @@ export default {
 				method,
 				params: method === 'get' ? payload : null,
 				data: method !== 'get' ? payload : null,
-			})
+			});
 		},
 		put(payload) {
 			return this.http(this.updateUrl, 'put', payload);
@@ -114,12 +119,12 @@ export default {
 			// debugger;
 			if (code == 0) {
 				this.form = {
-					...data
+					...data,
 				};
 			} else {
-				this.$modal.msgError('工艺信息获取失败')
+				this.$modal.msgError('工艺信息获取失败');
 			}
-		}
+		},
 	},
 };
 </script>

From a5c17d2276d72cb9856a6412d5aecb43a1731ada Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Tue, 28 Nov 2023 16:14:24 +0800
Subject: [PATCH 2/5] fix conflicts

---
 .../core/analysis/balanceAnalysis/index.vue   | 78 ++++++++++---------
 .../equipment/base/alarm/Record/index.vue     | 19 +----
 2 files changed, 43 insertions(+), 54 deletions(-)

diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue
index 5579da4a..8ce3b630 100644
--- a/src/views/core/analysis/balanceAnalysis/index.vue
+++ b/src/views/core/analysis/balanceAnalysis/index.vue
@@ -162,50 +162,54 @@ export default {
 
 		buildProps(nameData) {
 			return new Promise((resolve, reject) => {
-				const dateArr = Array.from(
-					new Set(
-						nameData
-							.map((item) => (item.tree == 1 ? item.name : undefined))
-							.filter((v) => v)
-					)
-				);
-				// 排个序
-				dateArr.sort().forEach((date) => {
-					this.tableProps.push({
-						label: date,
-						align: 'center',
-						children: [
-							{
-								prop: date + '_eq_ct',
-								label: '设备CT',
-								align: 'center',
-							},
-							{
-								prop: date + '_eq_tt',
-								label: '设备TT',
-								align: 'center',
-							},
-							{
-								prop: date + '_pl_ct',
-								label: '产线CT',
-								align: 'center',
-							},
-							{
-								prop: date + '_pl_tt',
-								label: '产线TT',
-								align: 'center',
-							},
-						],
+				try {
+					const dateArr = Array.from(
+						new Set(
+							nameData
+								.map((item) => (item.tree == 1 ? item.name : undefined))
+								.filter((v) => v)
+						)
+					);
+					// 排个序
+					dateArr.sort().forEach((date) => {
+						this.tableProps.push({
+							label: date,
+							align: 'center',
+							children: [
+								{
+									prop: date + '_eq_ct',
+									label: '设备CT',
+									align: 'center',
+								},
+								{
+									prop: date + '_eq_tt',
+									label: '设备TT',
+									align: 'center',
+								},
+								{
+									prop: date + '_pl_ct',
+									label: '产线CT',
+									align: 'center',
+								},
+								{
+									prop: date + '_pl_tt',
+									label: '产线TT',
+									align: 'center',
+								},
+							],
+						});
 					});
-				});
 
-				resolve();
+					resolve();
+				} catch (err) {
+					reject(err);
+				}
 			});
 		},
 
 		async buildTableData(data) {
 			/** 处理 工段 分组  */
-      const sectionList = data.map(item => {})
+			const sectionList = data.map((item) => {});
 		},
 
 		setRowSpan(arr) {
diff --git a/src/views/equipment/base/alarm/Record/index.vue b/src/views/equipment/base/alarm/Record/index.vue
index c4f93007..91a9f310 100644
--- a/src/views/equipment/base/alarm/Record/index.vue
+++ b/src/views/equipment/base/alarm/Record/index.vue
@@ -59,14 +59,9 @@
 <script>
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { publicFormatter } from '@/utils/dict';
-<<<<<<< HEAD
-const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
-
-=======
 import AddOrUpdate from './AddOrUpdate.vue';
 import moment from 'moment';
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
->>>>>>> projects/mes-test
 
 const btn = {
 	name: 'tableBtn',
@@ -97,13 +92,9 @@ export default {
 	mixins: [basicPageMixin],
 	data() {
 		return {
-<<<<<<< HEAD
-      searchBarKeys: ['equipmentName', 'createTime'],
-=======
 			readOnly: false,
 			chosedLogId: false,
 			searchBarKeys: ['equipmentName', 'recordTime'],
->>>>>>> projects/mes-test
 			tableBtn: [
 				// this.$auth.hasPermi('equipment:spare-parts-config:update')
 				// 	? {
@@ -128,11 +119,6 @@ export default {
 				{ prop: 'productionLine', label: '产线' },
 				{ prop: 'workshopSection', label: '工段' },
 				{ prop: 'equipment', label: '设备名称' },
-<<<<<<< HEAD
-				{ prop: 'alarmGrade', label: '报警级别', filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL) },
-        { prop: 'createTime', label: '报警时间',filter: timeFilter }, // 接口缺
-				{ prop: 'responsible1', label: '设备报警码' }, // 接口缺
-=======
 				{
 					prop: 'alarmGrade',
 					label: '报警级别',
@@ -140,7 +126,6 @@ export default {
 				},
 				{ prop: 'createTime', label: '报警时间', filter: timeFilter }, // 接口缺
 				{ prop: 'alarmCode', label: '设备报警码' }, // 接口缺
->>>>>>> projects/mes-test
 				{ prop: 'alarmContent', label: '报警内容' },
 				{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
 				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, // TODO: 是否换成按钮， 群里问
@@ -166,7 +151,7 @@ export default {
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
-          param: 'createTime',
+					param: 'createTime',
 					// defaultSelect: [
 					// 	new Date(y, m, d)
 					// 		.toLocaleString()
@@ -221,7 +206,7 @@ export default {
 				pageSize: 10,
 				lineId: null,
 				equipmentId: null,
-				recordTime: []
+				recordTime: [],
 			},
 			basePath: '/base/equipment-alarm-log',
 			list: [],

From a0790a6e191672cdebee9fdf776e3cafd16b4daa Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Tue, 28 Nov 2023 16:42:40 +0800
Subject: [PATCH 3/5] 11.28

---
 src/api/base/delivery.js                                 | 9 +++++++++
 src/styles/index.scss                                    | 6 +++++-
 .../delivery/deliveryLog/components/addOrUpdate.vue      | 9 ++++-----
 .../energyPlcConnect/components/energyPlcConnectAdd.vue  | 2 +-
 .../energyPlcConnect/components/energyPlcParamAdd.vue    | 2 +-
 .../monitoring/energyLimit/components/energyLimitAdd.vue | 2 +-
 .../energyStatistics/components/energyStatisticsAdd.vue  | 2 +-
 .../group/base/groupTeam/components/groupTeamAdd.vue     | 2 +-
 .../order/base/orderManage/components/addWorkOrder.vue   | 2 +-
 src/views/order/base/orderManage/components/orderAdd.vue | 6 +++---
 .../order/monitoring/orderCompletionMonitoring/index.vue | 7 +++++--
 11 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/api/base/delivery.js b/src/api/base/delivery.js
index 82c371c3..d04fd210 100644
--- a/src/api/base/delivery.js
+++ b/src/api/base/delivery.js
@@ -18,6 +18,15 @@ export function deliveryProgressPage(data) {
   })
 }
 
+// 获取订单列表
+export function listOrderList(query) {
+  return request({
+    url: '/extend/delivery-log/listOrderList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 获取发货进度分页
 export function deliveryLogDetPage(data) {
   return request({
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 6b3ebaee..d162abed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -196,4 +196,8 @@ input, textarea{
   margin-right: 8px;
   vertical-align: middle;
 }
-// 抽屉head区域---end
\ No newline at end of file
+// 抽屉head区域---end
+// 弹出框，上下分布，去掉label的padding-bottom
+.el-form--label-top .el-form-item__label {
+  padding: 0;
+}
\ No newline at end of file
diff --git a/src/views/delivery/deliveryLog/components/addOrUpdate.vue b/src/views/delivery/deliveryLog/components/addOrUpdate.vue
index 45f3f48f..15c43943 100644
--- a/src/views/delivery/deliveryLog/components/addOrUpdate.vue
+++ b/src/views/delivery/deliveryLog/components/addOrUpdate.vue
@@ -3,7 +3,7 @@
     <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="订单名" prop="orderId">
-          <el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in orderList"
               :key="item.id"
@@ -39,7 +39,7 @@
     <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="发货负责人" prop="deliveryPersonId">
-          <el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in personList"
               :key="item.id"
@@ -75,9 +75,8 @@
   </el-form>
 </template>
 <script>
-import { orderList } from '@/api/base/orderManage'
 import { getWorkerList } from '@/api/base/worker'
-import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog } from '@/api/base/delivery'
+import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog, listOrderList } from '@/api/base/delivery'
 export default {
   name: 'AddOrUpdate',
   data() {
@@ -116,7 +115,7 @@ export default {
       }
     },
     getSelectList() {
-      orderList().then(res => {
+      listOrderList().then(res => {
         this.orderList = res.data || []
       })
       getWorkerList().then(res => {
diff --git a/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue b/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
index 412e649d..1ccd2a15 100644
--- a/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
+++ b/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
@@ -1,7 +1,7 @@
 <template>
   <el-form ref="form" :rules="rules" label-width="100px" :model="form">
     <el-form-item label="关联表名" prop="plcId">
-      <el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;">
+      <el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;" filterable>
         <el-option
           v-for="item in plcList"
           :key="item.id"
diff --git a/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue b/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
index 1e14ce35..6eed9ca8 100644
--- a/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
+++ b/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="typeId">
-          <el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in energyListType"
               :key="item.id"
diff --git a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
index 667e1711..f963e713 100644
--- a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
+++ b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
@@ -15,7 +15,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="energyTypeId">
-          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" @change="toggleType">
+          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable @change="toggleType">
             <el-option
               v-for="item in this.energyTypeList"
               :key="item.id"
diff --git a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue b/src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue
index 0326ec95..2d9c8440 100644
--- a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue
+++ b/src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue
@@ -27,7 +27,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="energyTypeId">
-          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in energyListType"
               :key="item.id"
diff --git a/src/views/group/base/groupTeam/components/groupTeamAdd.vue b/src/views/group/base/groupTeam/components/groupTeamAdd.vue
index 249facd2..750e063f 100644
--- a/src/views/group/base/groupTeam/components/groupTeamAdd.vue
+++ b/src/views/group/base/groupTeam/components/groupTeamAdd.vue
@@ -15,7 +15,7 @@
     <el-row>
       <el-col :span="12">
         <el-form-item label="班组组长" prop="leaderId">
-          <el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" @change="selectLeader">
+          <el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" filterable @change="selectLeader">
             <el-option
               v-for="item in workerList"
               :key="item.id"
diff --git a/src/views/order/base/orderManage/components/addWorkOrder.vue b/src/views/order/base/orderManage/components/addWorkOrder.vue
index 100fd955..45f2a62e 100644
--- a/src/views/order/base/orderManage/components/addWorkOrder.vue
+++ b/src/views/order/base/orderManage/components/addWorkOrder.vue
@@ -6,7 +6,7 @@
           <el-input v-model="form.name"></el-input>
         </el-form-item>
         <el-form-item label="工单名称" prop="workOrderId"  v-if='isBind'>
-          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" @change="getWorkOrderMsg">
+          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" filterable @change="getWorkOrderMsg">
             <el-option
               v-for="item in workOrderList"
               :key="item.id"
diff --git a/src/views/order/base/orderManage/components/orderAdd.vue b/src/views/order/base/orderManage/components/orderAdd.vue
index 4ef85ec2..df871a9e 100644
--- a/src/views/order/base/orderManage/components/orderAdd.vue
+++ b/src/views/order/base/orderManage/components/orderAdd.vue
@@ -18,7 +18,7 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="产品名称" prop="planProductId">
-          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in productList"
               :key="item.id"
@@ -39,7 +39,7 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="客户" prop="customerId">
-          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable>
+          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable filterable>
             <el-option
               v-for="item in customerList"
               :key="item.id"
@@ -82,7 +82,7 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="关联工艺" prop="processFlowId">
-          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable @change="processFlowIdChange">
+          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable filterable @change="processFlowIdChange">
             <el-option
               v-for="item in processFlowList"
               :key="item.id"
diff --git a/src/views/order/monitoring/orderCompletionMonitoring/index.vue b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
index 81ef0549..b2a469cd 100644
--- a/src/views/order/monitoring/orderCompletionMonitoring/index.vue
+++ b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
@@ -154,7 +154,7 @@ export default {
       },
       tableProps,
       list: [],
-      tableH: this.tableHeight(315),
+      tableH: this.tableHeight(305),
       total: 0,
       tableBtn: [
       this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
@@ -215,7 +215,7 @@ export default {
   components: { MonitoringRingCharts },
   mounted() {
     window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(315)
+      this.tableH = this.tableHeight(305)
     })
     let start = moment().subtract(30, 'days').format('yyyy-MM-DD')
     let end = moment().format('yyyy-MM-DD')
@@ -347,6 +347,9 @@ export default {
   .el-tabs__item {
     color: rgba(0, 0, 0, 0.45);
   }
+  .searchBarBox {
+    margin-bottom: 0;
+  }
   .boxTitle {
     display: inline-block;
     font-size: 16px;

From 4873f750d82c2c81efcbb0078869cf8bbca0ca43 Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Tue, 28 Nov 2023 18:08:39 +0800
Subject: [PATCH 4/5] ui

---
 .../base/coreWorkOrder/add-or-updata.vue      |  16 +-
 src/views/base/coreWorkOrder/addWorkOrder.vue |   3 +-
 src/views/base/coreWorkOrder/attr-add.vue     | 153 ++++++++++--------
 src/views/base/coreWorkOrder/index.vue        |  53 ++++--
 .../base/inspection/Record/addRecord.vue      |  34 ++--
 .../base/inspection/Record/attr-add.vue       | 148 -----------------
 .../base/inspection/Record/index.vue          |   2 +-
 7 files changed, 158 insertions(+), 251 deletions(-)
 delete mode 100644 src/views/equipment/base/inspection/Record/attr-add.vue

diff --git a/src/views/base/coreWorkOrder/add-or-updata.vue b/src/views/base/coreWorkOrder/add-or-updata.vue
index 621469d4..0ba46ebd 100644
--- a/src/views/base/coreWorkOrder/add-or-updata.vue
+++ b/src/views/base/coreWorkOrder/add-or-updata.vue
@@ -2,23 +2,23 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-24 18:20:26
+ * @LastEditTime: 2023-11-28 14:09:09
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="true"
 		class="drawer"
 		size="50%">
 		<small-title slot="title" :no-padding="true">
-			{{ '预使用主原料信息' }}
+			{{ '工单名称：' + dataForm.name }}
 		</small-title>
 		<div class="content">
-			<div style="height: 10vh">
+			<!-- <div style="height: 10vh">
 				<div style="font-size: 18px;">工单名：{{ dataForm.name }}</div>
-			</div>
+			</div> -->
 
 			<div class="attr-list">
 				<small-title
@@ -30,7 +30,7 @@
 				<div class="action_btn">
 					<template>
             <span style="display: inline-block;">
-              <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
             </span>
           </template>
 				</div>
@@ -55,9 +55,9 @@
 					@pagination="getList" />
 			</div>
 
-			<div class="drawer-body__footer">
+			<!-- <div class="drawer-body__footer">
 				<el-button type="primary" @click="goback()">关闭</el-button>
-			</div>
+			</div> -->
 		</div>
 
 		<attr-add
diff --git a/src/views/base/coreWorkOrder/addWorkOrder.vue b/src/views/base/coreWorkOrder/addWorkOrder.vue
index a019d97d..d8314256 100644
--- a/src/views/base/coreWorkOrder/addWorkOrder.vue
+++ b/src/views/base/coreWorkOrder/addWorkOrder.vue
@@ -13,7 +13,7 @@
       </el-col>
       <el-col :span='8'>
         <el-form-item label="产品名称" prop="planProductId">
-          <el-select v-model="dataForm.planProductId" placeholder="请选择产品" style="width: 100%;" @change="selectProduct">
+          <el-select v-model="dataForm.planProductId" placeholder="请选择产品" style="width: 100%;" filterable @change="selectProduct">
             <el-option
               v-for="item in productList"
               :key="item.id"
@@ -175,6 +175,7 @@ export default {
         planQuantity: 0,
         processFlowId: '',
         materialMethod: 1,
+        triggerOrigin: 1,
         priority: '',
         productLineIds: [],
         type: '',
diff --git a/src/views/base/coreWorkOrder/attr-add.vue b/src/views/base/coreWorkOrder/attr-add.vue
index 155b5b6f..f32953ef 100644
--- a/src/views/base/coreWorkOrder/attr-add.vue
+++ b/src/views/base/coreWorkOrder/attr-add.vue
@@ -1,7 +1,7 @@
 <template>
 	<el-dialog
 		:visible.sync="visible"
-		:width="'35%'"
+		:width="'50%'"
 		:append-to-body="true"
 		:close-on-click-modal="false"
 		class="dialog">
@@ -17,73 +17,92 @@
 			ref="dataForm"
 			:model="dataForm"
 			:rules="dataRule"
-			label-width="100px"
+			label-width="80px"
 			@keyup.enter.native="dataFormSubmit()">
-			<el-form-item label="原料" prop="material">
-				<el-select
-					v-model="dataForm.material"
-					filterable
-					style="width: 100%"
-					placeholder="请选择原料">
-					<el-option
-						v-for="dict in getDictDatas('material')"
-						:key="dict.value"
-						:label="dict.label"
-						:value="dict.value" />
-				</el-select>
-			</el-form-item>
-			<el-form-item label="来源" prop="origin">
-				<el-select
-					v-model="dataForm.origin"
-					filterable
-					style="width: 100%"
-					placeholder="请选择来源">
-					<el-option
-						v-for="dict in originList"
-						:key="dict.value"
-						:label="dict.label"
-						:value="dict.value" />
-				</el-select>
-			</el-form-item>
-			<el-form-item label="供应商" prop="supplierId">
-				<el-select
-					v-model="dataForm.supplierId"
-					filterable
-					style="width: 100%"
-					placeholder="请选择供应商">
-					<el-option
-						v-for="dict in supplierList"
-						:key="dict.id"
-						:label="dict.name"
-						:value="dict.id" />
-				</el-select>
-			</el-form-item>
-			<el-form-item label="批次号" prop="batch">
-				<el-input
-					v-model="dataForm.batch"
-					clearable
-					placeholder="请输入批次号" />
-			</el-form-item>
-			<el-form-item label="数量" prop="num">
-				<el-input-number
-					v-model="dataForm.num"
-					clearable
-					style="width: 100%"
-					placeholder="请输入数量" />
-			</el-form-item>
-			<el-form-item label="单位" prop="unit">
-				<el-select
-					v-model="dataForm.unit"
-					filterable
-					style="width: 100%"
-					placeholder="请选择单位">
-					<el-option
-						v-for="dict in getDictDatas('unit_dict')"
-						:key="dict.value"
-						:label="dict.label"
-						:value="dict.value" />
-				</el-select>
-			</el-form-item>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="原料" prop="material">
+						<el-select
+							v-model="dataForm.material"
+							filterable
+							style="width: 100%"
+							placeholder="请选择原料">
+							<el-option
+								v-for="dict in getDictDatas('material')"
+								:key="dict.value"
+								:label="dict.label"
+								:value="dict.value" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="来源" prop="origin">
+						<el-select
+							v-model="dataForm.origin"
+							filterable
+							style="width: 100%"
+							placeholder="请选择来源">
+							<el-option
+								v-for="dict in originList"
+								:key="dict.value"
+								:label="dict.label"
+								:value="dict.value" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="供应商" prop="supplierId">
+						<el-select
+							v-model="dataForm.supplierId"
+							filterable
+							style="width: 100%"
+							placeholder="请选择供应商">
+							<el-option
+								v-for="dict in supplierList"
+								:key="dict.id"
+								:label="dict.name"
+								:value="dict.id" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="批次号" prop="batch">
+						<el-input
+							v-model="dataForm.batch"
+							clearable
+							placeholder="请输入批次号" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="数量" prop="num">
+						<el-input-number
+							v-model="dataForm.num"
+							clearable
+							controls-position="right"
+							style="width: 100%"
+							placeholder="请输入数量" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="单位" prop="unit">
+						<el-select
+							v-model="dataForm.unit"
+							filterable
+							style="width: 100%"
+							placeholder="请选择单位">
+							<el-option
+								v-for="dict in getDictDatas('unit_dict')"
+								:key="dict.value"
+								:label="dict.label"
+								:value="dict.value" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+			</el-row>
 		</el-form>
 
 		<el-row style="text-align: right">
diff --git a/src/views/base/coreWorkOrder/index.vue b/src/views/base/coreWorkOrder/index.vue
index cddf0fff..f03890b6 100644
--- a/src/views/base/coreWorkOrder/index.vue
+++ b/src/views/base/coreWorkOrder/index.vue
@@ -13,7 +13,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="300"
+				:width="350"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -57,7 +57,8 @@ import {
 	getCoreWOPage,
 	deleteCoreWO,
 	statusChange,
-	getConOrderList
+	getConOrderList,
+	getCoreWOList
 } from '@/api/base/coreWorkOrder';
 
 
@@ -66,19 +67,26 @@ const tableProps = [
 		prop: 'createTime',
 		label: '创建时间',
 		filter: parseTime,
-		'show-overflow-tooltip': true
+		minWidth: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '工单名称'
+		label: '工单名称',
+		minWidth: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '工单编码'
+		label: '工单编码',
+		minWidth: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'workers',
-		label: '负责人'
+		label: '负责人',
+		minWidth: 100,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'priority',
@@ -88,7 +96,7 @@ const tableProps = [
 	{
 		prop: 'triggerOrigin',
 		label: '来源',
-		filter: (val) => ['', 'MES', 'ERP'][val]
+		filter: (val) => ['', 'MES-手动', 'MES-订单下发', 'ERP'][val]
 	},
 	{
 		prop: 'status',
@@ -98,15 +106,19 @@ const tableProps = [
 	{
 		prop: 'planFinishTime',
 		label: '计划完成时间',
-		filter: parseTime
+		filter: parseTime,
+		minWidth: 150,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'planQuantity',
-		label: '计划生产数量'
+		label: '计划生产数量',
+		minWidth: 120,
 	},
 	{
 		prop: 'actualQuantity',
-		label: '实际生产数量'
+		label: '实际生产数量',
+		minWidth: 120,
 	}
 ];
 
@@ -251,6 +263,16 @@ export default {
 			].filter((v)=>v),
 			tableData: [],
 			formConfig: [
+				// {
+				// 	type: 'select',
+				// 	label: '工单名称',
+				// 	placeholder: '工单名称',
+				// 	param: 'name',
+				// 	defaultSelect: '',
+				// 	selectOptions: [],
+				// 	allowCreate: true,
+				// 	filterable: true
+				// },
 				{
 					type: 'input',
 					label: '工单名称',
@@ -308,9 +330,20 @@ export default {
 			this.listQuery.name = this.$route.query.workOrderName;
 			this.formConfig[0].defaultSelect = this.$route.query.workOrderName;
 		}
+		// this.getWorkOrder()
 		this.getDataList()
 	},
 	methods: {
+		getWorkOrder() {
+			getCoreWOList().then(res => {
+				this.formConfig[0].selectOptions = res.data.map(item => {
+					return {
+						name: item.name,
+						id: item.name
+					}
+				})
+			})
+		},
 		refreshWorkOrder(val) {
 			console.log(val)
 			if (val) {
diff --git a/src/views/equipment/base/inspection/Record/addRecord.vue b/src/views/equipment/base/inspection/Record/addRecord.vue
index 7c450930..ebac0548 100644
--- a/src/views/equipment/base/inspection/Record/addRecord.vue
+++ b/src/views/equipment/base/inspection/Record/addRecord.vue
@@ -10,7 +10,7 @@
 		ref="drawer"
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="false"
+		:wrapper-closable="isdetail"
 		class="drawer"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
@@ -85,6 +85,19 @@
 							placeholder="选择巡检时间" />
 					</el-form-item>
 				</el-col>
+				<el-col :span="12">
+					<el-form-item label="数据来源" prop="origin">
+						<el-select
+							v-model="dataForm.origin"
+							filterable
+							:disabled="isdetail"
+							style="width: 100%"
+							placeholder="请选择数据来源">
+							<el-option key="1" label="手动" :value="1" />
+							<el-option key="2" label="自动" :value="2" />
+						</el-select>
+					</el-form-item>
+				</el-col>
 			</el-row>
 			<el-form-item label="巡检内容">
 				<base-table
@@ -102,12 +115,9 @@
 			
 		</el-form>
 
-		<div class="drawer-body__footer">
-			<el-button type="primary" @click="goback()">{{ isdetail ? '关闭' : '取消' }}</el-button>
-			<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
-				编辑
-			</el-button> -->
-			<el-button v-if="!isdetail" type="primary" @click="dataFormSubmit()">确定</el-button>
+		<div v-if="!isdetail" class="drawer-body__footer">
+			<el-button type="primary" @click="goback()">取消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
 		</div>
 	</el-drawer>
 </template>
@@ -174,6 +184,7 @@ export default {
 				actualTime: undefined,
 				responsible: undefined,
 				description: undefined,
+				origin: undefined,
 				files: []
 			},
 			list: [],
@@ -227,15 +238,6 @@ export default {
 			return this.$refs.dataForm.resetFields(args);
 		},
 		initData() {
-			this.dataForm = {
-				id: undefined,
-				configId: undefined,
-				equipmentId: undefined,
-				actualTime: undefined,
-				responsible: undefined,
-				description: undefined,
-				files: []
-			}
 			this.list = []
 			this.file = ''
 			this.fileName = ''
diff --git a/src/views/equipment/base/inspection/Record/attr-add.vue b/src/views/equipment/base/inspection/Record/attr-add.vue
deleted file mode 100644
index bef3ae04..00000000
--- a/src/views/equipment/base/inspection/Record/attr-add.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-	<el-dialog
-		:visible.sync="visible"
-		:width="'35%'"
-		:append-to-body="true"
-		:close-on-click-modal="false"
-		class="dialog">
-		<template #title>
-			<slot name="title">
-				<div class="titleStyle">
-					{{ !dataForm.id ? '新增' : '编辑' }}
-				</div>
-			</slot>
-		</template>
-
-		<el-form
-			ref="dataForm"
-			:model="dataForm"
-			:rules="dataRule"
-			label-width="100px"
-			@keyup.enter.native="dataFormSubmit()">
-			<el-form-item label="备品备件" prop="sparePartId">
-				<el-select
-					v-model="dataForm.sparePartId"
-					filterable
-					style="width: 100%"
-					placeholder="请选择备品备件">
-					<el-option
-						v-for="dict in partList"
-						:key="dict.id"
-						:label="dict.name"
-						:value="dict.id" />
-				</el-select>
-			</el-form-item>
-		</el-form>
-
-		<el-row style="text-align: right">
-			<el-button @click="visible = false">取消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-		</el-row>
-	</el-dialog>
-</template>
-
-<script>
-import {
-	createConfigDet,
-	getSparePartList
-} from  '@/api/equipment/base/spare-parts/config';
-
-export default {
-	props: {
-		configId: {
-			type: String,
-			default: '',
-		},
-	},
-	data() {
-		return {
-			visible: false,
-			dataForm: {
-				id: undefined,
-				sparePartId: ''
-			},
-			partList: [],
-			dataRule: {
-				sparePartId: [{ required: true, message: '备品备件不能为空', trigger: 'change' }]
-			},
-		};
-	},
-	mounted() {
-		this.getDict()
-	},
-	methods: {
-		async getDict() {
-			const res = await getSparePartList()
-			this.partList = res.data
-		},
-		init(id) {
-			this.dataForm.id = id || '';
-			this.visible = true;
-			// this.$nextTick(() => {
-			// 	this.$refs['dataForm'].resetFields();
-			// 	if (this.dataForm.id) {
-			// 		getCoreProductAttr({
-			// 			id: this.dataForm.id
-			// 		}).then((res) => {
-			// 			const { name, value } = res.data;
-			// 			this.dataForm.name = name;
-			// 			this.dataForm.value = value;
-			// 		});
-			// 	}
-			// });
-		},
-		// 表单提交
-		dataFormSubmit() {
-			this.$refs['dataForm'].validate((valid) => {
-				if (valid) {
-					// 修改的提交
-					// if (this.dataForm.id) {
-					// 	updateCoreProductAttr({
-					// 		...this.dataForm,
-					// 		productId: this.productId,
-					// 	}).then((response) => {
-					// 		this.$modal.msgSuccess('修改成功');
-					// 		this.visible = false;
-					// 		this.$emit('refreshDataList');
-					// 	});
-					// 	return;
-					// }
-					// 添加的提交
-					createConfigDet({
-						...this.dataForm,
-						configId: this.configId,
-					}).then((response) => {
-						this.$modal.msgSuccess('新增成功');
-						this.visible = false;
-						this.$emit('refreshDataList');
-					});
-				}
-			});
-		},
-	},
-};
-</script>
-
-<style scoped>
-.dialog >>> .el-dialog__body {
-	padding: 30px 24px;
-}
-.dialog >>> .el-dialog__header {
-	font-size: 16px;
-	color: rgba(0, 0, 0, 0.85);
-	font-weight: 500;
-	padding: 13px 24px;
-	border-bottom: 1px solid #e9e9e9;
-}
-.dialog >>> .el-dialog__header .titleStyle::before {
-	content: '';
-	display: inline-block;
-	width: 4px;
-	height: 16px;
-	background-color: #0b58ff;
-	border-radius: 1px;
-	margin-right: 8px;
-	position: relative;
-	top: 2px;
-}
-</style>
diff --git a/src/views/equipment/base/inspection/Record/index.vue b/src/views/equipment/base/inspection/Record/index.vue
index 77b995ad..5dcee26b 100644
--- a/src/views/equipment/base/inspection/Record/index.vue
+++ b/src/views/equipment/base/inspection/Record/index.vue
@@ -93,7 +93,7 @@ export default {
 			tableProps: [
 				{ prop: 'configName', label: '配置名称' },
 				{ prop: 'equipmentName', label: '设备名称' },
-				// { prop: 'lineName', label: '数据来源' },
+				{ prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', '自动'][val] },
 				// { prop: 'sectionName', label: '计划巡检时间' },
 				{ prop: 'actualTime', label: '实际巡检时间', filter: parseTime },
 				// { prop: 'maintenanceDetail', label: '完成状态' },

From 27faa04c7a225de6a65b0dff5b6494d70b39fb70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Wed, 29 Nov 2023 08:48:09 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/monitoring/statisticalData/index.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/quality/monitoring/statisticalData/index.vue b/src/views/quality/monitoring/statisticalData/index.vue
index 756e2a64..f489f16c 100644
--- a/src/views/quality/monitoring/statisticalData/index.vue
+++ b/src/views/quality/monitoring/statisticalData/index.vue
@@ -259,10 +259,11 @@ export default {
   },
   mounted() {
     if (this.$route.query.woIdString) {
-      console.log(this.$route.query.woIdString);
-      this.queryParams.workOrderIdList = [this.$route.query.woIdString]
+      console.log(this.$route.query.woIdString)
+      this.queryParams.workOrderIdList = this.$route.query.woIdString.split(',')
+      // this.queryParams.workOrderIdList = [this.$route.query.woIdString]
       // let arr =[]
-      this.searchBarFormConfig[0].defaultSelect = [this.$route.query.woIdString]
+      this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
       console.log(this.searchBarFormConfig[0].defaultSelect);
     }
     // if (this.$route.params.startTime && this.$route.params.endTime) {