Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test

2023-11-29 08:48:41 +08:00 · 2023-11-29 08:48:41 +08:00 · 76771489da
commit 76771489da
parent 27faa04c7a 6e7339bca3
52 changed files with 1270 additions and 826 deletions
--- 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'
--- 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({
--- a/src/api/quality/processTraceability.js
+++ b/src/api/quality/processTraceability.js
@ -1,7 +1,7 @@
 /*
 * @Author: zhp
 * @Date: 2023-10-31 15:05:06
- * @LastEditTime: 2023-11-03 09:05:50
+ * @LastEditTime: 2023-11-28 09:28:05
 * @LastEditors: zhp
 * @Description:
 */
@ -24,6 +24,14 @@ export function getWorkOrderList(query) {
    params: query,
  })
 }
+
+export function getCoreProduct(id) {
+  return request({
+    url: '/base/core-product/get?id=' + id,
+    method: 'get'
+  })
+}
+
 // 导出物料信息
 // export function exportEnergyPlcExcel(query) {
 //   return request({
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@ -197,3 +197,7 @@ input, textarea{
  vertical-align: middle;
 }
 // 抽屉head区域---end
+// 弹出框，上下分布，去掉label的padding-bottom
+.el-form--label-top .el-form-item__label {
+  padding: 0;
+}
--- 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
--- 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: '',
--- 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,8 +17,10 @@
 			ref="dataForm"
 			:model="dataForm"
 			:rules="dataRule"
-			label-width="100px"
+			label-width="80px"
 			@keyup.enter.native="dataFormSubmit()">
+			<el-row :gutter="20">
+				<el-col :span="12">
 					<el-form-item label="原料" prop="material">
 						<el-select
 							v-model="dataForm.material"
@ -32,6 +34,8 @@
 								: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"
@ -45,6 +49,10 @@
 								: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"
@ -58,19 +66,28 @@
 								: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"
@ -84,6 +101,8 @@
 								:value="dict.value" />
 						</el-select>
 					</el-form-item>
+				</el-col>
+			</el-row>
 		</el-form>

 		<el-row style="text-align: right">
--- 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) {
--- a/src/views/base/mixins/basic-page.js
+++ b/src/views/base/mixins/basic-page.js
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2022-08-24 11:19:43
 * @LastEditors: zhp
- * @LastEditTime: 2023-11-01 10:30:12
+ * @LastEditTime: 2023-11-24 09:29:36
 * @Description:
 */
 export default {
@ -85,6 +85,7 @@ export default {
    },
    //tableBtn点击
    handleClick(val) {
+      console.log(val.data.packagingCode);
      if (val.type === "edit") {
        this.addOrUpdateVisible = true;
        this.addOrEditTitle = "编辑";
@ -92,7 +93,7 @@ export default {
          this.$refs.addOrUpdate.init(val.data.id);
        });
      } else if (val.type === "delete") {
-        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
+        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data.packagingCode )
      } else if (val.type === "change") {
        this.changeStatus(val.data.id)
      } else {
@ -101,7 +102,7 @@ export default {
    },
    // 删除
    deleteHandle(id, name, index) {
-      this.$confirm(`是否确认删除${name ? '[' + name + ']' : '[' + index + ']'}数据项?`, "提示", {
+      this.$confirm(`是否确认删除${name ? ' 名称为'+ name : '[' + index + ']'}数据项?`, "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
--- a/src/views/base/packagingPrintLog/index.vue
+++ b/src/views/base/packagingPrintLog/index.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-08-01 14:55:51
 * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 14:40:59
+ * @LastEditTime: 2023-11-24 09:13:50
 * @Description:
 -->
 <template>
@ -122,7 +122,8 @@ export default {
          selectOptions: [],
          labelField: 'name',
          valueField: 'id',
-          param: 'workOrderId'
+          param: 'workOrderId',
+          filterable: true,
        },
        {
          // parent: 'dateFilterType',
@ -214,6 +215,26 @@ export default {
        // this.listQuery.total = response.data.total;
      })
    },
+    deleteHandle(id, name, index, packagingCode) {
+      this.$confirm(`是否确认删除${'[' + packagingCode + ']'}数据项?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
+    },
    handlePrint(id) {
      if (id) {
        getPackingModel(id).then(res => {
--- a/src/views/core/analysis/balanceAnalysis/index
+++ b/src/views/core/analysis/balanceAnalysis/index
@ -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>
--- a/src/views/core/analysis/balanceAnalysis/index.vue
+++ b/src/views/core/analysis/balanceAnalysis/index.vue
@ -1,74 +1,69 @@
 <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" />
+		<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>
-    <div v-else class="no-data-bg"></div>
-    <!-- <pagination
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
-			@pagination="getDataList" /> -->
+			</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
+		BalanceChart,
 	},
-  // mixins: [basicPage],
+	mixins: [basicPageMixin],
 	data() {
 		return {
-      urlOptions: {
-        getDataListURL: getCT,
+			activeName: 'table',
+			tableProps: [
+				{
+					prop: 'sectionName',
+					label: '工段',
+					align: 'center',
 				},
-      tableProps: [],
-      dataListLoading: false,
+				{
+					prop: 'equName',
+					label: '设备',
+					align: 'center',
+				},
+			],
 			tableData: [],
-      listQuery: {
-        // time: ''
-        endTime: undefined,
-        lineId:undefined,
-        startTime:undefined
-      },
-      timeList: [],
-      spanArr: [], 
-      xData: [],
-      yData: [],
-      optionArrUrl: [getCorePLList],
 			formConfig: [
 				{
 					type: 'select',
@ -82,55 +77,158 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					dateType: 'monthrange',
+					format: 'yyyy-MM',
+					valueFormat: 'yyyy-MM-ddTHH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
-          width: 350,
-          param: 'time',
+					width: 240,
+					param: 'timeArr',
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
-        }
+				},
 			],
+			queryParams: {
+				lineId: null,
+				startTime: null,
+				endTime: null,
+			},
 		};
 	},
-  created() {
-    this.getArr();
+
+	mounted() {
+		this.getLine();
 	},
+
 	methods: {
-    getArr() {
-      const params = {
-        page: 1,
-        limit: 500
+		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;
 			}
-      this.optionArrUrl.forEach((item, index) => {
-        item(params).then((response) => {
-          this.formConfig[index].selectOptions = response.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) => {
+				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();
+				} catch (err) {
+					reject(err);
+				}
+			});
 		},
+
+		async buildTableData(data) {
+			/** 处理 工段 分组  */
+			const sectionList = data.map((item) => {});
+		},
+
 		setRowSpan(arr) {
-      let count = 0
+			let count = 0;
 			arr.forEach((item, index) => {
 				if (index === 0) {
-          this.spanArr.push(1)
+					this.spanArr.push(1);
 				} else {
 					if (item === arr[index - 1]) {
-            this.spanArr[count] += 1
-            this.spanArr.push(0)
+						this.spanArr[count] += 1;
+						this.spanArr.push(0);
 					} else {
-            count = index
-            this.spanArr.push(1)
+						count = index;
+						this.spanArr.push(1);
 					}
 				}
-      })
+			});
 		},
+
 		/** 合并table列的规则 */
 		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
 			if (columnIndex == 0) {
@ -144,12 +242,13 @@ 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)
+			this.urlOptions.getDataListURL(this.listQuery).then((res) => {
+				console.log(res);
 				let arr = [
 					{
 						prop: 'sectionName',
@ -160,42 +259,42 @@ export default {
 						prop: 'equName',
 						label: '设备',
 						align: 'center',
-          }
-        ]
-        let sectionArr= []
+					},
+				];
+				let sectionArr = [];
 				res.data.data.forEach((ele, index) => {
-          let tempData = []
-          let eqData = []
-            let plData = []
+					let tempData = [];
+					let eqData = [];
+					let plData = [];
 					ele.data.forEach((item, index) => {
-            item.children.forEach(params => {
+						item.children.forEach((params) => {
 							if (params.dynamicName === '设备CT') {
-                tempData[item.dynamicName + '_eq'] = params.dynamicValue
-                eqData[index] = params.dynamicValue
+								tempData[item.dynamicName + '_eq'] = params.dynamicValue;
+								eqData[index] = params.dynamicValue;
 							} else {
-                tempData[item.dynamicName + '_pl'] = params.dynamicValue
-                plData[index] = params.dynamicValue
+								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))
+						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 = {
@ -203,44 +302,66 @@ export default {
 							align: 'center',
 							children: [
 								{ prop: times + '_eq', label: '设备CT', align: 'center' },
-                { prop: times + '_pl', label: '产线CT', align: 'center' }
-              ]
-            }
-            arr.push(subprop)
-            this.xData.push(times)
+								{ prop: times + '_pl', label: '产线CT', align: 'center' },
+							],
+						};
+						arr.push(subprop);
+						this.xData.push(times);
 					}
 				}
-        this.tableProps = arr
+				this.tableProps = arr;

-        console.log('表格横坐标', this.xData, this.yData)
+				console.log('表格横坐标', this.xData, this.yData);
 				this.$nextTick(() => {
-          this.$refs.lineChart.initChart(this.xData, this.yData)
-        })
+					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;
+					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()
+						this.tableData = [];
+						this.xData = [];
+						this.yData = [];
+						this.tableProps = [];
+						this.spanArr = [];
+						this.timeList = [];
+						this.getData();
 					} else {
 						this.$message({
 							message: '请选择产线和时间',
-              type: 'warning'
+							type: 'warning',
 						});
 					}
 					break;
--- 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 => {
--- 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"
--- 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"
--- 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"
--- 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"
--- 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,
--- a/src/views/equipment/base/alarm/Record/index.vue
+++ b/src/views/equipment/base/alarm/Record/index.vue
@ -151,7 +151,7 @@ export default {
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'recordTime',
+					param: 'createTime',
 					// defaultSelect: [
 					// 	new Date(y, m, d)
 					// 		.toLocaleString()
@ -206,7 +206,7 @@ export default {
 				pageSize: 10,
 				lineId: null,
 				equipmentId: null,
-				recordTime: []
+				recordTime: [],
 			},
 			basePath: '/base/equipment-alarm-log',
 			list: [],
--- 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
--- 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 = '添加参数绑定信息';
--- 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 = ''
--- a/src/views/equipment/base/inspection/Record/attr-add.vue
+++ b/src/views/equipment/base/inspection/Record/attr-add.vue
@ -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>
--- 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: '完成状态' },
--- 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"
--- a/src/views/extend/processEquMaterialBom/add-or-updata.vue
+++ b/src/views/extend/processEquMaterialBom/add-or-updata.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 16:50:55
+ * @LastEditTime: 2023-11-28 10:03:20
 * @Description:
 -->
 <template>
@ -53,7 +53,7 @@
          </el-form-item>
        </el-form>
      </div>
-      <div class="drawer-body__footer">
+      <div v-if="!isdetail" class="drawer-body__footer">
        <el-button style="" @click="goback()">取消</el-button>
        <el-button v-if="isdetail" type="primary" @click="goEdit()">
          编辑
--- a/src/views/extend/processEquValueBom/add-or-updata.vue
+++ b/src/views/extend/processEquValueBom/add-or-updata.vue
@ -1,8 +1,13 @@
 <!--
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
+<<<<<<< HEAD
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-11-28 10:09:20
+=======
 * @LastEditors: DY
 * @LastEditTime: 2023-11-27 16:37:17
+>>>>>>> projects/mes-test
 * @Description:
 -->
 <template>
@ -140,7 +145,7 @@ const tableProps = [
    label: '最小值（工艺）',
  },
  {
-    prop: 'manValue',
+    prop: 'maxValue',
    label: '最大值（工艺）',
  },
  {
--- a/src/views/extend/processEquValueBom/attr-add.vue
+++ b/src/views/extend/processEquValueBom/attr-add.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-11-08 15:30:27
- * @LastEditTime: 2023-11-23 14:26:54
+ * @LastEditTime: 2023-11-28 10:11:40
 * @LastEditors: zhp
 * @Description:
 -->
@ -84,7 +84,7 @@ export default {
      },
      equipmentId:null,
 			dataRule: {
-				attrName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+        paramId: [{ required: true, message: '参数名称不能为空', trigger: 'change' }],
 			},
 		};
  },
--- 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;
 			}
--- 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,
 		},
--- 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('请选择设备');
 				}
 			});
--- 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;
 					});
 			});
--- 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,13 +119,13 @@ export default {
 			// debugger;
 			if (code == 0) {
 				this.form = {
-					...data
+					...data,
 				};
 			} else {
-				this.$modal.msgError('工艺信息获取失败')
-			}
+				this.$modal.msgError('工艺信息获取失败');
 			}
 		},
+	},
 };
 </script>

--- a/src/views/extend/processTraceability/index.vue
+++ b/src/views/extend/processTraceability/index.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-08-01 14:55:51
 * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 14:23:40
+ * @LastEditTime: 2023-11-28 10:34:24
 * @Description:
 -->
 <template>
@ -26,9 +26,10 @@ import { parseTime } from '../../core/mixins/code-filter';
 import {
  getProcessTraceabilityPage,
  getWorkOrderList,
+  getCoreProduct
  // exportEnergyPlcExcel
 } from '@/api/quality/processTraceability';
-
+import { publicFormatter } from '@/utils/dict';
 const tableProps = [
  {
    prop: 'name',
@ -44,7 +45,8 @@ const tableProps = [
  },
  {
    prop: 'status',
-    label: '状态'
+    label: '状态',
+    filter: (val) => val == 1 ? '等待' : val == 2 ? '激活' : val == 3 ? '暂停' : val == 4 ? '完成' : '作废',
  },
  {
    prop: 'startProduceTime',
@ -61,8 +63,9 @@ const tableProps = [
    label: '生产数量'
  },
  {
-    prop: 'unit',
-    label: '单位'
+    prop: 'planProductUnit',
+    label: '单位',
+    filter: publicFormatter('unit_dict')
  },
  {
    prop: 'processFlowName',
@ -113,7 +116,8 @@ export default {
          selectOptions: [],
          labelField: 'name',
          valueField: 'id',
-          param: 'orderName'
+          param: 'orderName',
+          filterable: true,
        },
        {
          type: 'datePicker',
@ -182,17 +186,25 @@ export default {
    handleClick(val) {
      if (val.type === "processDetail") {
        console.log(val);
+        let specificationsData =''
+        getCoreProduct(val.data.planProductId).then((res) => {
+          console.log(res)
+
          this.$router.push({
-          name: 'process-traceability-detail',
-          params: {
-            id: '1715180991838887938',
+            path: 'process-traceability-detail',
+            query: {
+              id: val.data.processFlowId,
              orderId: val.data.id,
              name: val.data.name,
+              specifications: res.data.specifications,
              productName: val.data.planProductName,
-            processFlowName: val.data.processFlowName
+              processFlowName: val.data.processFlowName,
+              // planProductId: val.data.planProductId
              // equipmentName,
            },
          });
+        })
+
        // this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
      }
    },
--- a/src/views/extend/processTraceabilityDetail/components/ProcessBomList.vue
+++ b/src/views/extend/processTraceabilityDetail/components/ProcessBomList.vue
@ -117,11 +117,11 @@ export default {
        // },
        { prop: 'name', label: '参数名' },
        {
-          prop: 'name', label: '设定范围最小- 最大 / 标准',
+          prop: 'status', label: '设定范围最小- 最大 / 标准',
          subcomponent: StatusBtn
        },
        {
-          prop: 'code', label: '最小值',
+          prop: '', label: '最小值',
          children: [
            {
              prop: 'minValueSet',
@ -134,7 +134,7 @@ export default {
          ]
        },
        {
-          prop: 'code', label: '最大值',
+          prop: '', label: '最大值',
          children: [
            {
              prop: 'maxValueSet',
@ -184,9 +184,9 @@ export default {
      getDetMaterial({
        pageNo: 1,
        pageSize: 10,
-        orderId: this.$route.params.orderId,
+        orderId: this.$route.query.orderId,
        flowDetId: [this.detId],
-        // orderId: this.$route.params.orderId,
+        // orderId: this.$route.query.orderId,

      },).then((res) => {
        console.log(res);
@ -231,25 +231,29 @@ export default {
        getDetMaterial({
          pageNo: 1,
          pageSize: 10,
-          orderId: this.$route.params.orderId,
+          orderId: this.$route.query.orderId,
          flowDetId: [this.detId],
-          // orderId: this.$route.params.orderId,
+          // orderId: this.$route.query.orderId,

        },).then((res) => {
+          if (res.data.length != []) {
            this.materialList = res.data[0].data
            this.name = res.data[0].name
+          }
        })
      } else {
        getDetValue({
          pageNo: 1,
          pageSize: 10,
-          orderId: this.$route.params.orderId,
+          orderId: this.$route.query.orderId,
          flowDetId: [this.detId],
-          // orderId: this.$route.params.orderId,
+          // orderId: this.$route.query.orderId,

        }).then((res) => {
+          if (res.data.length != []) {
            this.valueList = res.data[0].data
            this.name = res.data[0].name
+          }
        })
      }
    },
@ -258,12 +262,14 @@ export default {
      getDetMaterial({
        pageNo: 1,
        pageSize: 10,
-        orderId: this.$route.params.orderId,
+        orderId: this.$route.query.orderId,
        flowDetId: [this.detId],
      }).then((res) => {
        console.log(res);
+        if (res.data.length != []) {
          this.materialList = res.data[0].data
          this.name = res.data[0].name
+        }
      })
 		},
 		clearList() {
--- a/src/views/extend/processTraceabilityDetail/components/ProcessDetail.vue
+++ b/src/views/extend/processTraceabilityDetail/components/ProcessDetail.vue
@ -123,7 +123,7 @@ export default {
 		}
 	},
  mounted() {
-    console.log(this.$route.params.id)
+    console.log(this.$route.query.id)
 		this.loadLayout().then(json => {
 			this.initGraph(json)
 		})
@ -260,7 +260,7 @@ export default {
 		},

 		async loadLayout() {
-      const flowId = this.$route.params.id;
+      const flowId = this.$route.query.id;
      console.log(flowId)
 			if (!flowId) return { cells: [] }
 			const { code, data } = await this.info({ id: flowId });
@ -288,12 +288,12 @@ export default {
 		async handleUpdateLayout() {
 			this.layout.content = JSON.stringify(this.graph.toJSON());
 			let code, data;
-			console.table([this.layout, this.$route.params.id])
+			console.table([this.layout, this.$route.query.id])
 			// 手动刷新布局
 			if (this.layout.id) {
 				({ code, data } = await this.http('/extend/process-flow-view/update', 'put', this.layout));
 			} else {
-				this.layout.flowId = this.$route.params.id;
+				this.layout.flowId = this.$route.query.id;
 				({ code, data } = await this.http('/extend/process-flow-view/create', 'post', this.layout));
 			}

@ -410,7 +410,7 @@ export default {
 		},

 		createProcess() {
-			// const flowId = this.$route.params.id;
+			// const flowId = this.$route.query.id;
 			const flowId = this.getFlowId(); // it also works
 			if (!flowId) {
 				this.$modal.msgError('工艺ID不能为空');
--- a/src/views/extend/processTraceabilityDetail/components/ProcessInfo.vue
+++ b/src/views/extend/processTraceabilityDetail/components/ProcessInfo.vue
@ -20,14 +20,13 @@
        <InfoItem label="产品名称" :value="form.productName" />
      </el-col>
      <el-col :span="6">
-        <InfoItem label="产品规格"  />
+        <InfoItem label="产品规格" :value="form.specifications" />
      </el-col>
    </el-row>
  </section>
 </template>

 <script>
-
 const InfoItem = {
 	name: 'InfoItem',
 	components: {},
@ -62,6 +61,7 @@ export default {
 				id: null,
 				name: null,
        productName: null,
+        specifications:null,
        processFlowName: null,
 				// remark: null,
 				// enable: null,
@ -71,6 +71,7 @@ export default {
 	},
 	mounted() {
    this.getInfo()
+    console.log(this.$route.query)
 	},
 	computed: {},
 	methods: {
@ -95,12 +96,14 @@ export default {
 		// info(payload) {
 		// 	return this.http(this.infoUrl, 'get', payload);
 		// },
-    async getInfo() {
-      this.form.name = this.$route.params.name
-      this.form.productName = this.$route.params.productName
-      this.form.processFlowName = this.$route.params.processFlowName
-      // this.form.name = this.$route.params.name
-      // const flowId = this.$route.params.id;
+    getInfo() {
+      // console.log(this.$route.query.planProductId);
+      this.form.name = this.$route.query.name
+      this.form.specifications = this.$route.query.specifications
+      this.form.productName = this.$route.query.productName
+      this.form.processFlowName = this.$route.query.processFlowName
+      // this.form.name = this.$route.query.name
+      // const flowId = this.$route.query.id;
      // console.log(flowId);
 			// if (!flowId) this.$router.go(-1);
 			// const { code, data } = await this.info({ id: flowId });
--- 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"
--- 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"
--- 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"
--- 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;
--- a/src/views/quality/base/qualityInspectionDet/index.vue
+++ b/src/views/quality/base/qualityInspectionDet/index.vue
@ -1,49 +1,23 @@
 <template>
  <div class="app-container">
    <!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
+    <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />

    <!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
+    <base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
      @emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				fixed="right"
-				:method-list="tableBtn"
+      <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn"
        @clickBtn="handleTableBtnClick" />
    </base-table>

    <!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
      @pagination="getList" />

    <!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			width="40%"
-			@close="cancel"
-			@cancel="cancel"
+    <base-dialog :dialogTitle="title" :dialogVisible="open" width="40%" @close="cancel" @cancel="cancel"
      @confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:rows="[
+      <DialogForm v-if="open" ref="form" v-model="form" :rows="[
      	[
      		{
      			select: true,
@ -55,8 +29,6 @@
      				filterable: true,
      			},
          },
-					],
-					[
              {
      			input: true,
      			label: '检测内容',
@ -64,6 +36,7 @@
      			rules: [{ required: true, message: '检测内容不能为空', trigger: 'blur' }],
      		},
      	],
+
        [
          {
            input: true,
@ -71,8 +44,7 @@
            prop: 'code',
            url: '/base/quality-inspection-det/getCode',
          },
-					],
-					[{ input: true, label: '备注', prop: 'remark' }],
+          { input: true, label: '备注', prop: 'remark' }],
      ]" />
    </base-dialog>
  </div>
--- a/src/views/quality/base/qualityInspectionType/index.vue
+++ b/src/views/quality/base/qualityInspectionType/index.vue
@ -1,47 +1,23 @@
 <template>
  <div class="app-container">
    <!-- 搜索工作栏 -->
-		<SearchBar
-			:formConfigs="searchBarFormConfig"
-			ref="search-bar"
-			@headBtnClick="handleSearchBarBtnClick" />
+    <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />

    <!-- 列表 -->
-		<base-table
-			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-data="list"
+    <base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
      @emitFun="handleEmitFun">
-			<method-btn
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				label="操作"
-				:width="120"
-				:method-list="tableBtn"
+      <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" :method-list="tableBtn"
        @clickBtn="handleTableBtnClick" />
    </base-table>

    <!-- 分页组件 -->
-		<pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
      @pagination="getList" />

    <!-- 对话框(添加 / 修改) -->
-		<base-dialog
-			:dialogTitle="title"
-			:dialogVisible="open"
-			@close="cancel"
-			@cancel="cancel"
+    <base-dialog :dialogTitle="title" :dialogVisible="open" @close="cancel" width="30%" @cancel="cancel"
      @confirm="submitForm">
-			<DialogForm
-				v-if="open"
-				ref="form"
-				v-model="form"
-				:rows="[
+      <DialogForm v-if="open" ref="form" v-model="form" :rows="[
      	[
      		{
      			input: true,
--- a/src/views/quality/base/qualityScrapType/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapType/add-or-updata.vue
@ -1,13 +1,13 @@
 <!--
 * @Author: zhp
 * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2023-11-06 15:36:31
+ * @LastEditTime: 2023-11-24 08:42:18
 * @LastEditors: zhp
 * @Description:
 -->
 <template>
-  <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="auto">
-    <el-row :gutter="20">
+  <el-form :model="dataForm"  :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()">
+    <el-row :gutter="24">
      <el-col :span="12">
        <el-form-item label="报废类型编码" prop="code">
          <el-input v-model="dataForm.code" placeholder="请输入报废类型编码" />
@ -19,7 +19,7 @@
        </el-form-item>
      </el-col>
    </el-row>
-    <el-row :gutter="20">
+    <el-row :gutter="24">
      <el-col :span="12">
        <el-form-item label="描述类型" prop="description">
          <el-input v-model="dataForm.description" clearable placeholder="描述类型" />
--- a/src/views/quality/monitoring/currentData/index.vue
+++ b/src/views/quality/monitoring/currentData/index.vue
@ -316,6 +316,10 @@ export default {
              type: 'bar',
              showBackground: true,
              barWidth: '20',
+              label: {
+                show: true,
+                position: 'top'
+              },
              backgroundStyle: {
                color: 'rgba(180, 180, 180, 0.2)'
              }
--- a/src/views/quality/monitoring/materielDateFrom/index.vue
+++ b/src/views/quality/monitoring/materielDateFrom/index.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-08-01 14:55:51
 * @LastEditors: zhp
- * @LastEditTime: 2023-11-10 16:25:02
+ * @LastEditTime: 2023-11-24 10:55:54
 * @Description:
 -->
 <template>
@ -132,6 +132,9 @@ export default {
          name: 'search',
          color: 'primary',
        },
+        {
+          type: 'separate',
+        },
        // {
        // 	type: 'separate',
        // },
--- a/src/views/quality/monitoring/processTraceability/index.vue
+++ b/src/views/quality/monitoring/processTraceability/index.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-08-01 14:55:51
 * @LastEditors: zhp
- * @LastEditTime: 2023-11-10 16:32:28
+ * @LastEditTime: 2023-11-28 10:51:44
 * @Description:
 -->
 <template>
@ -26,10 +26,10 @@ import { parseTime } from '../mixins/code-filter';
 import {
  getProcessTraceabilityPage,
  getWorkOrderList,
+  getCoreProduct
  // exportEnergyPlcExcel
 } from '@/api/quality/processTraceability';
 import { publicFormatter } from '@/utils/dict';
-
 const tableProps = [
  {
    prop: 'name',
@ -46,7 +46,7 @@ const tableProps = [
  {
    prop: 'status',
    label: '状态',
-    filter:publicFormatter('work_order_status')
+    filter: (val) => val == 1 ? '等待' : val == 2 ? '激活' : val == 3 ? '暂停' : val == 4 ? '完成' : '作废',
  },
  {
    prop: 'startProduceTime',
@ -63,7 +63,7 @@ const tableProps = [
    label: '生产数量'
  },
  {
-    prop: 'unit',
+    prop: 'planProductUnit',
    label: '单位',
    filter: publicFormatter('unit_dict')
  },
@ -73,7 +73,7 @@ const tableProps = [
  },
  {
    prop: 'yield',
-    label: '成品率'
+    label: '合格率'
  }
 ];

@ -116,21 +116,22 @@ export default {
          selectOptions: [],
          labelField: 'name',
          valueField: 'id',
-          param: 'orderName'
+          param: 'orderName',
+          filterable: true,
+        },
+        {
+          type: 'datePicker',
+          label: '工单开始时间',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 250
        },
-        // {
-        //   type: 'datePicker',
-        //   label: '时间段',
-        //   dateType: 'daterange',
-        //   format: 'yyyy-MM-dd',
-        //   valueFormat: "yyyy-MM-dd",
-        //   rangeSeparator: '-',
-        //   startPlaceholder: '开始时间',
-        //   endPlaceholder: '结束时间',
-        //   param: 'timeVal',
-        //   defaultSelect: [],
-        //   width: 250
-        // },
        {
          type: 'button',
          btnName: '搜索',
@ -185,17 +186,25 @@ export default {
    handleClick(val) {
      if (val.type === "processDetail") {
        console.log(val);
+        let specificationsData =''
+        getCoreProduct(val.data.planProductId).then((res) => {
+          console.log(res)
+
          this.$router.push({
-          name: 'process-traceability-detail',
-          params: {
-            id: '1715180991838887938',
+            path: 'process-traceability-detail',
+            query: {
+              id: val.data.processFlowId,
              orderId: val.data.id,
              name: val.data.name,
+              specifications: res.data.specifications,
              productName: val.data.planProductName,
-            processFlowName: val.data.processFlowName
+              processFlowName: val.data.processFlowName,
+              // planProductId: val.data.planProductId
              // equipmentName,
            },
          });
+        })
+
        // this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
      }
    },
@ -241,13 +250,13 @@ export default {
      if (val.btnName === 'search') {
        this.listQuery.orderName = val.orderName ? val.orderName :undefined
        // this.queryParams.status = val.status
-        // if (val.timeVal && val.timeVal.length != 0 ) {
-        // this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
-        // this.listQuery.endTime = val.timeVal[1] + ' 23:59:59'
-        // } else {
-        //   this.listQuery.startTime = undefined
-        //   this.listQuery.endTime = undefined
-        // }
+        if (val.timeVal && val.timeVal.length != 0 ) {
+        this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
+        this.listQuery.endTime = val.timeVal[1] + ' 23:59:59'
+        } else {
+          this.listQuery.startTime = undefined
+          this.listQuery.endTime = undefined
+        }
        this.getList()
      } else {
        // this.handleExport()
--- a/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessBomList.vue
+++ b/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessBomList.vue
@ -117,11 +117,11 @@ export default {
        // },
        { prop: 'name', label: '参数名' },
        {
-          prop: 'name', label: '设定范围最小- 最大 / 标准',
+          prop: 'status', label: '设定范围最小- 最大 / 标准',
          subcomponent: StatusBtn
        },
        {
-          prop: 'code', label: '最小值',
+          prop: '', label: '最小值',
          children: [
            {
              prop: 'minValueSet',
@ -134,7 +134,7 @@ export default {
          ]
        },
        {
-          prop: 'code', label: '最大值',
+          prop: '', label: '最大值',
          children: [
            {
              prop: 'maxValueSet',
@ -184,9 +184,9 @@ export default {
      getDetMaterial({
        pageNo: 1,
        pageSize: 10,
-        orderId: this.$route.params.orderId,
+        orderId: this.$route.query.orderId,
        flowDetId: [this.detId],
-        // orderId: this.$route.params.orderId,
+        // orderId: this.$route.query.orderId,

      },).then((res) => {
        console.log(res);
@ -231,25 +231,29 @@ export default {
        getDetMaterial({
          pageNo: 1,
          pageSize: 10,
-          orderId: this.$route.params.orderId,
+          orderId: this.$route.query.orderId,
          flowDetId: [this.detId],
-          // orderId: this.$route.params.orderId,
+          // orderId: this.$route.query.orderId,

        },).then((res) => {
+          if (res.data.length != []) {
            this.materialList = res.data[0].data
            this.name = res.data[0].name
+          }
        })
      } else {
        getDetValue({
          pageNo: 1,
          pageSize: 10,
-          orderId: this.$route.params.orderId,
+          orderId: this.$route.query.orderId,
          flowDetId: [this.detId],
-          // orderId: this.$route.params.orderId,
+          // orderId: this.$route.query.orderId,

        }).then((res) => {
+          if (res.data.length != []) {
            this.valueList = res.data[0].data
            this.name = res.data[0].name
+          }
        })
      }
    },
@ -258,12 +262,14 @@ export default {
      getDetMaterial({
        pageNo: 1,
        pageSize: 10,
-        orderId: this.$route.params.orderId,
+        orderId: this.$route.query.orderId,
        flowDetId: [this.detId],
      }).then((res) => {
        console.log(res);
+        if (res.data.length != []) {
          this.materialList = res.data[0].data
          this.name = res.data[0].name
+        }
      })
 		},
 		clearList() {
--- a/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessDetail.vue
+++ b/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessDetail.vue
@ -123,7 +123,7 @@ export default {
 		}
 	},
  mounted() {
-    console.log(this.$route.params.id)
+    console.log(this.$route.query.id)
 		this.loadLayout().then(json => {
 			this.initGraph(json)
 		})
@ -260,7 +260,7 @@ export default {
 		},

 		async loadLayout() {
-      const flowId = this.$route.params.id;
+      const flowId = this.$route.query.id;
      console.log(flowId)
 			if (!flowId) return { cells: [] }
 			const { code, data } = await this.info({ id: flowId });
@ -288,12 +288,12 @@ export default {
 		async handleUpdateLayout() {
 			this.layout.content = JSON.stringify(this.graph.toJSON());
 			let code, data;
-			console.table([this.layout, this.$route.params.id])
+			console.table([this.layout, this.$route.query.id])
 			// 手动刷新布局
 			if (this.layout.id) {
 				({ code, data } = await this.http('/extend/process-flow-view/update', 'put', this.layout));
 			} else {
-				this.layout.flowId = this.$route.params.id;
+				this.layout.flowId = this.$route.query.id;
 				({ code, data } = await this.http('/extend/process-flow-view/create', 'post', this.layout));
 			}

@ -410,7 +410,7 @@ export default {
 		},

 		createProcess() {
-			// const flowId = this.$route.params.id;
+			// const flowId = this.$route.query.id;
 			const flowId = this.getFlowId(); // it also works
 			if (!flowId) {
 				this.$modal.msgError('工艺ID不能为空');
--- a/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessInfo.vue
+++ b/src/views/quality/monitoring/processTraceabilityDetail/components/ProcessInfo.vue
@ -20,14 +20,13 @@
        <InfoItem label="产品名称" :value="form.productName" />
      </el-col>
      <el-col :span="6">
-        <InfoItem label="产品规格"  />
+        <InfoItem label="产品规格" :value="form.specifications" />
      </el-col>
    </el-row>
  </section>
 </template>

 <script>
-
 const InfoItem = {
 	name: 'InfoItem',
 	components: {},
@ -62,6 +61,7 @@ export default {
 				id: null,
 				name: null,
        productName: null,
+        specifications:null,
        processFlowName: null,
 				// remark: null,
 				// enable: null,
@ -71,6 +71,7 @@ export default {
 	},
 	mounted() {
    this.getInfo()
+    console.log(this.$route.query)
 	},
 	computed: {},
 	methods: {
@ -95,12 +96,14 @@ export default {
 		// info(payload) {
 		// 	return this.http(this.infoUrl, 'get', payload);
 		// },
-    async getInfo() {
-      this.form.name = this.$route.params.name
-      this.form.productName = this.$route.params.productName
-      this.form.processFlowName = this.$route.params.processFlowName
-      // this.form.name = this.$route.params.name
-      // const flowId = this.$route.params.id;
+    getInfo() {
+      // console.log(this.$route.query.planProductId);
+      this.form.name = this.$route.query.name
+      this.form.specifications = this.$route.query.specifications
+      this.form.productName = this.$route.query.productName
+      this.form.processFlowName = this.$route.query.processFlowName
+      // this.form.name = this.$route.query.name
+      // const flowId = this.$route.query.id;
      // console.log(flowId);
 			// if (!flowId) this.$router.go(-1);
 			// const { code, data } = await this.info({ id: flowId });
--- a/src/views/quality/monitoring/processTraceabilityDetail/index.vue
+++ b/src/views/quality/monitoring/processTraceabilityDetail/index.vue
@ -1,3 +1,10 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-11-28 10:41:50
+ * @LastEditTime: 2023-11-28 10:49:43
+ * @LastEditors: zhp
+ * @Description:
+-->
 <!--
    filename: index.vue
    author: liubin
@ -37,8 +44,8 @@ export default {
 		};
 	},
 	mounted() {
-		console.log('activated...', this.$route.params);
-		this.flowId = this.$route.params.id;
+		console.log('activated...', this.$route.query);
+		this.flowId = this.$route.query.id;
  },
 	computed: {},
 	methods: {
--- a/src/views/quality/monitoring/statisticalData/index.vue
+++ b/src/views/quality/monitoring/statisticalData/index.vue
@ -9,8 +9,8 @@
 		<!-- 列表 -->
 		<base-table
 			:table-props="tableProps"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
+			:page="1"
+			:limit="10"
 			:table-data="list">
 			<!-- <method-btn
 				v-if="tableBtn.length"
@ -109,9 +109,6 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				{
-					type: 'separate',
-				},
 				// {
 				// 	type: this.$auth.hasPermi(
 				// 		'base:quality-inspection-record:create'