Merge pull request 'projects/qhd-line-zhp' (#467 ) from projects/qhd-line-zhp into projects/qhd-line-test

Reviewed-on: #467
Merge branch 'projects/qhd-line-test' into projects/qhd-line-zhp
2025-12-23 08:52:44 +08:00 · 2025-12-23 08:51:19 +08:00 · 2025-12-23 08:49:37 +08:00 · 2025-12-17 16:30:08 +08:00 · 2025-12-17 16:27:13 +08:00 · 2025-12-15 10:48:29 +08:00
17 changed files with 1725 additions and 1018 deletions
--- a/.env.dev
+++ b/.env.dev
@@ -12,8 +12,8 @@ ENV = 'development'
 VUE_APP_TITLE = 智能监控分析系统

 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://172.16.32.79:48080'
-# VUE_APP_BASE_API = 'http://line.kszny.picaiba.com'
+# VUE_APP_BASE_API = 'http://172.16.32.79:48082'
+VUE_APP_BASE_API = 'http://line.kszny.picaiba.com'


 # 路由懒加载
--- a/dist.zip
+++ b/dist.zip
--- a/src/api/core/monitoring/auto.js
+++ b/src/api/core/monitoring/auto.js
@@ -111,3 +111,17 @@ export function getProcessAutoReportNew(data) {
 		data: data,
 	});
 }
+export function getProcessAutoReportLastGroup(data) {
+	return request({
+		url: '/monitoring/production-monitor/getProcessAutoReportLastGroup',
+		method: 'post',
+		data: data,
+	});
+}
+export function getPLlistByFactory(data) {
+	return request({
+		url: 'base/production-line/listByFactory',
+		method: 'post',
+		data: data,
+	});
+}
--- a/src/views/base/material/add-or-updata.vue
+++ b/src/views/base/material/add-or-updata.vue
@@ -88,7 +88,32 @@ export default {
 		};
 	},
 	created() {},
-	methods: {
-	},
+  methods: {
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          if (response.code === 1001033 || response.code === 1001034) {
+            return this.$modal.msgError(response.msg);
+          }
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
+  },
 };
 </script>
--- a/src/views/base/materialPricing/add-or-updata.vue
+++ b/src/views/base/materialPricing/add-or-updata.vue
@@ -120,7 +120,30 @@ export default {
 							.label;
 				}
 			});
-		},
+    },
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          console.log('response', response);
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
 	},
 };
 </script>
--- a/src/views/core/analysis/balanceAnalysis/index.vue
+++ b/src/views/core/analysis/balanceAnalysis/index.vue
@@ -6,65 +6,39 @@
 * @Description:
 -->
 <template>
-	<div class="app-container">
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@select-changed="handleSearchBarChanged"
-			@headBtnClick="buttonClick" />
-		<div v-if="showData.length">
-			<base-table
-				class="right-aside"
-				v-loading="dataListLoading"
-				:table-props="tableProps"
-				:page="1"
-				:limit="999"
-				:table-data="showData">
-				<method-btn
-					v-if="showData.length"
-					slot="handleBtn"
-					:width="80"
-					label="操作"
-					:method-list="tableBtn"
-					@clickBtn="handleClick" />
-			</base-table>
-			<barChart
-				v-for="item in chartData"
-				:key="item.name + 'echart'"
-				style="margin-top: 50px"
-				height="600px"
-				:id="item.name + 'echart'"
-				:title="item.name + ' 节拍趋势图'"
-				:bar-data="item" />
-		</div>
-		<div v-else class="no-data-bg"></div>
-		<base-dialog
-			:dialogTitle="addOrEditTitle"
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			close-on-click-modal
-      top="0"
-			width="50%">
-			<eq-detail ref="eqDetail" />
-			<slot name="footer">
-				<el-row slot="footer" type="flex" justify="end">
-					<el-col :span="24">
-						<el-button size="small" class="btnTextStyle" @click="handleCancel">
-							取消
-						</el-button>
-					</el-col>
-				</el-row>
-			</slot>
-		</base-dialog>
-	</div>
+  <div class="app-container">
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @select-changed="handleSearchBarChanged"
+      @headBtnClick="buttonClick" />
+    <div v-if="showData.length">
+      <base-table class="right-aside" v-loading="dataListLoading" :table-props="tableProps" :page="1" :limit="999"
+        :table-data="showData">
+        <method-btn v-if="showData.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <barChart v-for="item in chartData" :key="item.name + 'echart'" style="margin-top: 50px" height="600px"
+        :id="item.name + 'echart'" :title="item.name + ' 节拍趋势图'" :bar-data="item" />
+    </div>
+    <div v-else class="no-data-bg"></div>
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+      @confirm="handleConfirm" :before-close="handleCancel" close-on-click-modal top="0" width="50%">
+      <eq-detail ref="eqDetail" />
+      <slot name="footer">
+        <el-row slot="footer" type="flex" justify="end">
+          <el-col :span="24">
+            <el-button size="small" class="btnTextStyle" @click="handleCancel">
+              取消
+            </el-button>
+          </el-col>
+        </el-row>
+      </slot>
+    </base-dialog>
+  </div>
 </template>

 <script>
 import eqDetail from './eq-detail';
 import { parseTime } from '../../mixins/code-filter';
-import { getPdList } from '@/api/core/monitoring/auto';
+import { getPLlistByFactory } from '@/api/core/monitoring/auto';
 import { getNewCTNow, getNewCTCharts } from '@/api/core/analysis/index';
 import { getFactoryPage } from '@/api/core/base/factory';
 // import codeFilter from '../../mixins/code-filter'
@@ -73,230 +47,233 @@ import FileSaver from 'file-saver';
 import barChart from './BarChart.vue';

 const tableProps = [
-	{
-		prop: 'factoryName',
-		label: '工厂',
-	},
-	{
-		prop: 'lineName',
-		label: '产线',
-	},
-	{
-		prop: 'size',
-		label: '规格',
-		showOverflowtooltip: true,
-	},
-	{
-		prop: 'process',
-		label: '产品工艺',
-	},
-	{
-		prop: 'edgeCt',
-		label: '磨边当前节拍pcs/min',
-	},
-	{
-		prop: 'temperCt',
-		label: '钢化当前节拍pcs/min',
-	},
-	{
-		prop: 'downCt',
-		label: '下片当前节拍pcs/min',
-	},
+  {
+    prop: 'factoryName',
+    label: '工厂',
+  },
+  {
+    prop: 'lineName',
+    label: '产线',
+  },
+  {
+    prop: 'size',
+    label: '规格',
+    showOverflowtooltip: true,
+  },
+  {
+    prop: 'process',
+    label: '产品工艺',
+  },
+  {
+    prop: 'edgeCt',
+    label: '磨边当前节拍pcs/min',
+  },
+  {
+    prop: 'temperCt',
+    label: '钢化当前节拍pcs/min',
+  },
+  {
+    prop: 'downCt',
+    label: '下片当前节拍pcs/min',
+  },
 ];

 export default {
-	components: {
-		barChart,
-		eqDetail,
-	},
-	data() {
-		return {
-			urlOptions: {
-				getDataListURL: getNewCTNow,
-			},
-			listQuery: {
-				lineId: [],
-			},
-			fileName: '',
-			dataListLoading: false,
-			tableProps,
-			tableBtn: [
-				{
-					type: 'eq',
-					btnName: '详情',
-				},
-			].filter((v) => v),
-			showData: [],
-			tableData: [],
-			chartData: [],
-			formConfig: [
-				{
-					type: 'select',
-					label: '工厂',
-					selectOptions: [],
-					param: 'factoryId',
-					onchange: true,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'lineId',
-					multiple: true,
-				},
-				{
-					type: 'datePicker',
-					label: '时间范围',
-					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'timestamp',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'timeVal',
-					width: 350,
-					clearable: false,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: 'separate',
-				// },
-				// {
-				// 	// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
-				// 	type: 'button',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
-			],
-			addOrEditTitle: '',
-			addOrUpdateVisible: false,
-		};
-	},
-	created() {
-		// 获取当前时间
-		const now = new Date();
-		// 获取前一天的同一时间
-		const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000);
-		// 设置为00:00:00
-		yesterday.setHours(0, 0, 0, 0);
-		// 设置为23:59:59
-		const end = new Date(yesterday.getTime());
-		end.setHours(23, 59, 59, 59);
-		this.listQuery.startTime = yesterday.getTime();
-		this.listQuery.endTime = end.getTime();
-		this.$nextTick(() => {
-			this.$refs.searchBarForm.formInline.timeVal = [
-				yesterday.getTime(),
-				end.getTime(),
-			];
-		});
-		this.getDataList();
-		this.getPdLineList();
-	},
-	methods: {
-		handleExport() {
-			let tables = document.querySelector('.el-table').cloneNode(true);
-			const fix = tables.querySelector('.el-table__fixed');
-			const fixRight = tables.querySelector('.el-table__fixed-right');
-			if (fix) {
-				tables.removeChild(tables.querySelector('.el-table__fixed'));
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'));
-			}
-			let exportTable = XLSX.utils.table_to_book(tables);
+  components: {
+    barChart,
+    eqDetail,
+  },
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: getNewCTNow,
+      },
+      listQuery: {
+        lineId: [],
+      },
+      fileName: '',
+      dataListLoading: false,
+      tableProps,
+      tableBtn: [
+        {
+          type: 'eq',
+          btnName: '详情',
+        },
+      ].filter((v) => v),
+      showData: [],
+      tableData: [],
+      chartData: [],
+      formConfig: [
+        {
+          type: 'select',
+          label: '工厂',
+          selectOptions: [],
+          param: 'factoryId',
+          collapseTags: true,
+          multiple: true,
+          onchange: true,
+        },
+        {
+          type: 'select',
+          label: '产线',
+          selectOptions: [],
+          param: 'lineId',
+          collapseTags: true,
+          multiple: true,
+        },
+        {
+          type: 'datePicker',
+          label: '时间范围',
+          dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'timestamp',
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          defaultTime: ['00:00:00', '23:59:59'],
+          param: 'timeVal',
+          width: 350,
+          clearable: false,
+        },
+        {
+          type: 'button',
+          btnName: '查询',
+          name: 'search',
+          color: 'primary',
+        },
+        // {
+        // 	type: 'separate',
+        // },
+        // {
+        // 	// type: this.$auth.hasPermi('base:factory:export') ? 'button' : '',
+        // 	type: 'button',
+        // 	btnName: '导出',
+        // 	name: 'export',
+        // 	color: 'warning',
+        // },
+      ],
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+    };
+  },
+  created() {
+    // 获取当前时间
+    const now = new Date();
+    // 获取前一天的同一时间
+    const yesterday = new Date(now.getTime());
+    // 设置为00:00:00
+    yesterday.setHours(0, 0, 0, 0);
+    // 设置为23:59:59
+    const end = new Date(yesterday.getTime());
+    end.setHours(23, 59, 59, 59);
+    this.listQuery.startTime = yesterday.getTime();
+    this.listQuery.endTime = end.getTime();
+    this.$nextTick(() => {
+      this.$refs.searchBarForm.formInline.timeVal = [
+        yesterday.getTime(),
+        end.getTime(),
+      ];
+    });
+    this.getDataList();
+    this.getPdLineList();
+  },
+  methods: {
+    handleExport() {
+      let tables = document.querySelector('.el-table').cloneNode(true);
+      const fix = tables.querySelector('.el-table__fixed');
+      const fixRight = tables.querySelector('.el-table__fixed-right');
+      if (fix) {
+        tables.removeChild(tables.querySelector('.el-table__fixed'));
+      }
+      if (fixRight) {
+        tables.removeChild(tables.querySelector('.el-table__fixed-right'));
+      }
+      let exportTable = XLSX.utils.table_to_book(tables);

-			var exportTableOut = XLSX.write(exportTable, {
-				bookType: 'xlsx',
-				bookSST: true,
-				type: 'array',
-			});
-			// sheetjs.xlsx为导出表格的标题名称
-			try {
-				FileSaver.saveAs(
-					new Blob([exportTableOut], {
-						type: 'application/octet-stream',
-					}),
-					this.fileName + '产线自动报表.xlsx'
-				);
-			} catch (e) {
-				if (typeof console !== 'undefined') console.log(e, exportTableOut);
-			}
-			return exportTableOut;
-		},
-		getPdLineList() {
-			getPdList().then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-			const params = {
-				pageSize: 100,
-				pageNo: 1,
-			};
-			getFactoryPage(params).then((res) => {
-				this.formConfig[0].selectOptions = res.data.list || [];
-			});
-		},
-		buttonClick(val) {
-			switch (val.btnName) {
-				case 'search':
-					this.listQuery.factoryId = val.factoryId || undefined;
-					this.listQuery.lineId = val.lineId ? val.lineId : [];
-					this.listQuery.startTime = val.timeVal ? val.timeVal[0] : undefined;
-					this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined;
-					this.getDataList();
-					break;
-				case 'export':
-					this.handleExport();
-					break;
-				default:
-					console.log(val);
-			}
-		},
-		// 获取数据列表
-		getDataList() {
-			this.dataListLoading = true;
-			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
-				this.tableData = response.data;
-				this.dataListLoading = false;
-				this.showData = this.tableData;
-			});
-			getNewCTCharts(this.listQuery).then((response) => {
-				this.chartData = response.data;
-			});
-		},
-		handleSearchBarChanged({ param, value }) {
-			this.listQuery.lineId = [];
-			this.$refs.searchBarForm.formInline.lineId = undefined;
-			getPdList(value).then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
-		handleClick(val) {
-			this.addOrUpdateVisible = true;
-			this.addOrEditTitle =
-				val.data?.factoryName + '-' + val.data?.lineName + ' 详情';
-			this.$nextTick(() => {
-				this.$refs.eqDetail.init(
-					val.data.lineId,
-					this.listQuery.startTime,
-					this.listQuery.endTime
-				);
-			});
-		},
-		handleCancel() {
-			this.addOrUpdateVisible = false;
-			this.addOrEditTitle = '';
-		},
-		handleConfirm() {
-			this.handleCancel();
-		},
-	},
+      var exportTableOut = XLSX.write(exportTable, {
+        bookType: 'xlsx',
+        bookSST: true,
+        type: 'array',
+      });
+      // sheetjs.xlsx为导出表格的标题名称
+      try {
+        FileSaver.saveAs(
+          new Blob([exportTableOut], {
+            type: 'application/octet-stream',
+          }),
+          this.fileName + '产线自动报表.xlsx'
+        );
+      } catch (e) {
+        if (typeof console !== 'undefined') console.log(e, exportTableOut);
+      }
+      return exportTableOut;
+    },
+    getPdLineList() {
+      // getPLlistByFactory().then((res) => {
+      // 	this.formConfig[1].selectOptions = res.data || [];
+      // });
+      const params = {
+        pageSize: 100,
+        pageNo: 1,
+      };
+      getFactoryPage(params).then((res) => {
+        this.formConfig[0].selectOptions = res.data.list || [];
+      });
+    },
+    buttonClick(val) {
+      switch (val.btnName) {
+        case 'search':
+          this.listQuery.factoryId = val.factoryId || undefined;
+          this.listQuery.lineId = val.lineId ? val.lineId : [];
+          this.listQuery.startTime = val.timeVal ? val.timeVal[0] : undefined;
+          this.listQuery.endTime = val.timeVal ? val.timeVal[1] : undefined;
+          this.getDataList();
+          break;
+        case 'export':
+          this.handleExport();
+          break;
+        default:
+          console.log(val);
+      }
+    },
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then((response) => {
+        this.tableData = response.data;
+        this.dataListLoading = false;
+        this.showData = this.tableData;
+      });
+      getNewCTCharts(this.listQuery).then((response) => {
+        this.chartData = response.data;
+      });
+    },
+    handleSearchBarChanged({ param, value }) {
+      this.listQuery.lineId = [];
+      this.$refs.searchBarForm.formInline.lineId = undefined;
+      getPLlistByFactory({ factoryIds: this.$refs.searchBarForm.formInline.factoryId }).then((res) => {
+        this.formConfig[1].selectOptions = res.data || [];
+      });
+    },
+    handleClick(val) {
+      this.addOrUpdateVisible = true;
+      this.addOrEditTitle =
+        val.data?.factoryName + '-' + val.data?.lineName + ' 详情';
+      this.$nextTick(() => {
+        this.$refs.eqDetail.init(
+          val.data.lineId,
+          this.listQuery.startTime,
+          this.listQuery.endTime
+        );
+      });
+    },
+    handleCancel() {
+      this.addOrUpdateVisible = false;
+      this.addOrEditTitle = '';
+    },
+    handleConfirm() {
+      this.handleCancel();
+    },
+  },
 };
 </script>
--- a/src/views/core/base/product/add-or-updata.vue
+++ b/src/views/core/base/product/add-or-updata.vue
@@ -80,7 +80,7 @@
              </el-form-item>
            </el-col>
          </el-row>
-          <el-row :gutter="20">
+          <!-- <el-row :gutter="20">
            <el-col :span="12">
              <el-form-item label="	基板类型" prop="typeDictValue">
                <el-select :disabled="isdetail" v-model="dataForm.typeDictValue" clearable style="width: 100%"
@@ -89,7 +89,7 @@
                </el-select>
              </el-form-item>
            </el-col>
-          </el-row>
+          </el-row> -->
        </el-form>

        <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
--- a/src/views/core/monitoring/groupReport/index.vue
+++ b/src/views/core/monitoring/groupReport/index.vue
@@ -348,7 +348,7 @@ export default {
 			dataListLoading: false,
 			tableProps,
      tableBtn: [
-        this.$auth.hasPermi(`monitoring:group-off:update`)
+        this.$auth.hasPermi(`monitoring:group-off:detail`)
          ? {
            type: 'eq',
            btnName: '详情',
--- a/src/views/core/monitoring/lineAuto/index.vue
+++ b/src/views/core/monitoring/lineAuto/index.vue
--- a/src/views/core/monitoring/nextClip/hisData.vue
+++ b/src/views/core/monitoring/nextClip/hisData.vue
@@ -101,7 +101,7 @@ const tableProps = [
 	},
 	{
    prop: 'thick',
-    label: '玻璃长度/mm'
+    label: '玻璃厚度/mm'
 	},
 ];

@@ -275,7 +275,7 @@ export default {
          fileName += this.listQuery.thick + '_';
        }
        // 添加时间戳避免文件名重复
-        fileName += + '.xlsx';
+        fileName + '.xlsx';

        FileSaver.saveAs(blob, fileName);
        this.$message.success('导出成功');
--- a/src/views/core/monitoring/nextClip/index.vue
+++ b/src/views/core/monitoring/nextClip/index.vue
@@ -358,8 +358,8 @@ export default {
    handleExport() {
      // 处理查询参数
      let params = { ...this.listQuery };
-      params.pageNo = undefined;
-      params.pageSize = undefined;
+      // params.pageNo = undefined;
+      // params.pageSize = undefined;
      this.$modal.confirm('是否确认导出下片日志?').then(() => {
        this.exportLoading = true;
        return exportDownLogData(params);
--- a/src/views/core/monitoring/productAuto/index.vue
+++ b/src/views/core/monitoring/productAuto/index.vue
--- a/src/views/equipment/equipmentOverview/index.vue
+++ b/src/views/equipment/equipmentOverview/index.vue
@@ -216,7 +216,7 @@ import {
 import { getTree } from '@/api/base/equipment';
 import { getEquipmentTypePage } from '@/api/base/equipmentType';
 import { getEquipmentOverall } from '@/api/base/equipment';
-
+import { getTenantId } from '@/utils/auth'
 // import * as XLSX from 'xlsx';
 // import FileSaver from 'file-saver';
 import ButtonNav from '@/components/ButtonNav';
@@ -569,7 +569,7 @@ export default {
      const token = getAccessToken();
      const headers = new Headers({
        Authorization: `Bearer ${token}`,
-        'tenant-id': store.getters.userId,
+        'tenant-id': getTenantId(),
        'Content-Type': 'text/event-stream',
      });

--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -278,8 +278,8 @@ export default {
 			mobileCodeTimer: 0,
 			loginForm: {
 				loginType: 'uname',
-				username: 'admin',
-				password: 'admin123',
+				username: '',
+				password: '',
 				captchaVerification: '',
 				mobile: '',
 				mobileCode: '',
--- a/src/views/quality/dpdda/defectAnalysis.vue
+++ b/src/views/quality/dpdda/defectAnalysis.vue
@@ -34,28 +34,7 @@ export default {
  mixins: [basicPageMixin],
  data() {
    return {
-      // tableBtn: [
-      //   this.$auth.hasPermi('base:quality-inspection-type:update')
-      //     ? {
-      //       type: 'edit',
-      //       btnName: '修改',
-      //     }
-      //     : undefined,
-      //   this.$auth.hasPermi('base:quality-inspection-type:delete')
-      //     ? {
-      //       type: 'delete',
-      //       btnName: '删除',
-      //     }
-      //     : undefined,
-      // ].filter((v) => v),
      tableProps: [
-        // {
-        //   prop: 'createTime',
-        //   label: '添加时间',
-        //   fixed: true,
-        //   width: 180,
-        //   filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-        // },
        { prop: 'factoryName', label: '工厂' },
        { prop: 'lineName', label: '产线' },
        { prop: 'remark', label: '玻璃编号' },
@@ -74,42 +53,7 @@ export default {
        },
        { prop: 'reason', label: '判等原因' },
        { prop: 'specifications', label: '规格' },
-
-
-        // {
-        // 	label: '操作',
-        // 	alignt: 'center',
-        // 	subcomponent: {
-        // 		render: function (h) {
-        // 			return h('div', null, [
-        // 				h(
-        // 					'el-button',
-        // 					{
-        // 						props: {
-        // 							icon: 'el-icon-edit',
-        // 							size: 'mini',
-        // 							type: 'text',
-        // 						},
-        // 					},
-        // 					' 修改'
-        // 				),
-        // 				h(
-        // 					'el-button',
-        // 					{
-        // 						props: {
-        // 							icon: 'el-icon-edit',
-        // 							size: 'mini',
-        // 							type: 'text',
-        // 						},
-        // 					},
-        // 					' 修改'
-        // 				),
-        // 			]);
-        // 		},
-        // 	},
-        // },
      ],
-      //
      searchBarFormConfig: [
        {
          type: 'select',
@@ -121,6 +65,7 @@ export default {
          type: 'select',
          label: '产线',
          selectOptions: [],
+          multiple: true,
          param: 'lineId',
        },
        {
@@ -134,13 +79,13 @@ export default {
          label: '时间范围',
          dateType: 'datetimerange',
          format: 'yyyy-MM-dd HH:mm:ss',
-          // valueFormat: 'timestamp',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'timestamp',
          rangeSeparator: '-',
          startPlaceholder: '开始时间',
          endPlaceholder: '结束时间',
          param: 'timeVal',
-          width: 350
+          width: 350,
+          defaultSelect: [],
        },
        {
          type: 'button',
@@ -148,23 +93,9 @@ export default {
          name: 'search',
          color: 'primary',
        },
-        // {
-        // 	type: 'button',
-        // 	btnName: '重置',
-        // 	name: 'reset',
-        // },
        {
          type: 'separate',
        },
-        // {
-        //   type: this.$auth.hasPermi('base:quality-inspection-type:create')
-        //     ? 'button'
-        //     : '',
-        //   btnName: '新增',
-        //   name: 'add',
-        //   plain: true,
-        //   color: 'success',
-        // },
        {
          type: this.$auth.hasPermi('base:quality-inspection-type:export')
            ? 'button'
@@ -214,11 +145,55 @@ export default {
  // 		deep: true
  // 	},
  // },
-  created() {
+  mounted() {
+    const { startTimestamp, endTimestamp } = this.getThreeDaysAgoThisTimeToNowTimeStamps();
+    // 找到时间范围的配置项并赋值（对应你代码中的timeVal参数）
+    this.searchBarFormConfig[3].defaultSelect = [startTimestamp, endTimestamp]; // 赋值给日期选择器
+    this.queryParams.startTime = startTimestamp;
+    this.queryParams.endTime = endTimestamp;
    this.getList();
    this.getDict()
  },
  methods: {
+    getThreeDaysAgoThisTimeToNowTimeStamps() {
+      const now = new Date();
+      // 1. 计算三天前的当前时刻（使用setDate直接修改日期，保留时分秒等信息）
+      const threeDaysAgoThisTime = new Date(now); // 复制当前日期对象，避免修改原对象
+      threeDaysAgoThisTime.setDate(threeDaysAgoThisTime.getDate() - 3); // 日期减3天，时分秒保持和当前一致
+
+      // 2. 获取时间戳（毫秒级和秒级）
+      // 开始时间戳：三天前的当前时刻
+      const startTimestamp = threeDaysAgoThisTime.getTime(); // 毫秒级
+      const startTimestampSec = Math.floor(startTimestamp / 1000); // 秒级
+      // 结束时间戳：当前时刻
+      const endTimestamp = now.getTime(); // 毫秒级
+      const endTimestampSec = Math.floor(endTimestamp / 1000); // 秒级
+
+      // 封装日期格式化函数，转换为yyyy-MM-dd HH:mm:ss格式
+      const formatDateTime = (date) => {
+        const y = date.getFullYear();
+        // 月份是从0开始的，所以要+1；补零确保是两位
+        const m = String(date.getMonth() + 1).padStart(2, '0');
+        const d = String(date.getDate()).padStart(2, '0');
+        const h = String(date.getHours()).padStart(2, '0');
+        const min = String(date.getMinutes()).padStart(2, '0');
+        const s = String(date.getSeconds()).padStart(2, '0');
+        return `${y}-${m}-${d} ${h}:${min}:${s}`;
+      };
+
+      // 格式化后的字符串：三天前的当前时刻 和 当前时刻
+      const startDateTimeStr = formatDateTime(threeDaysAgoThisTime);
+      const endDateTimeStr = formatDateTime(now);
+
+      return {
+        startTimestamp, // 三天前当前时刻的毫秒级时间戳
+        endTimestamp,   // 当前时刻的毫秒级时间戳
+        startTimestampSec, // 三天前当前时刻的秒级时间戳
+        endTimestampSec,    // 当前时刻的秒级时间戳
+        startDateTimeStr,   // yyyy-MM-dd HH:mm:ss格式的开始时间字符串
+        endDateTimeStr      // yyyy-MM-dd HH:mm:ss格式的结束时间字符串
+      };
+    },
    getDict() {
      getPdList().then(res => {
        this.searchBarFormConfig[1].selectOptions = res.data || [];
@@ -249,11 +224,6 @@ export default {
          this.queryParams.startTime = btn.timeVal ? btn.timeVal[0] : undefined
          this.queryParams.endTime = btn.timeVal ? btn.timeVal[1] : undefined
          this.queryParams.checkNum = btn.checkNum ? btn.checkNum : undefined
-
-
-          // keys.forEach((key) => {
-          //   this.queryParams[key] = btn[key] || null;
-          // });
          this.getList();
          break;
        case 'add':
@@ -262,10 +232,6 @@ export default {
        case 'export':
          this.handleExport();
          break;
-        // case 'reset':
-        //   this.$refs['search-bar'].resetForm();
-        //   this.resetQuery();
-        //   break;
      }
    },
    /** 查询列表 */
--- a/src/views/quality/dpdda/defectSummary.vue
+++ b/src/views/quality/dpdda/defectSummary.vue
@@ -150,7 +150,8 @@ export default {
          startPlaceholder: '开始时间',
          endPlaceholder: '结束时间',
          param: 'timeVal',
-          width: 350
+          width: 350,
+          defaultSelect: [],
        },
        {
          type: 'button',
@@ -226,11 +227,56 @@ export default {
  // 		deep: true
  // 	},
  // },
-  created() {
+  mounted() {
+
+    const { startTimestamp, endTimestamp } = this.getThreeDaysAgoThisTimeToNowTimeStamps();
+    // 找到时间范围的配置项并赋值（对应你代码中的timeVal参数）
+    this.searchBarFormConfig[2].defaultSelect = [startTimestamp, endTimestamp]; // 赋值给日期选择器
+    this.queryParams.startTime = startTimestamp;
+    this.queryParams.endTime = endTimestamp;
    this.getList();
    this.getDict()
  },
  methods: {
+    getThreeDaysAgoThisTimeToNowTimeStamps() {
+      const now = new Date();
+      // 1. 计算三天前的当前时刻（使用setDate直接修改日期，保留时分秒等信息）
+      const threeDaysAgoThisTime = new Date(now); // 复制当前日期对象，避免修改原对象
+      threeDaysAgoThisTime.setDate(threeDaysAgoThisTime.getDate() - 3); // 日期减3天，时分秒保持和当前一致
+
+      // 2. 获取时间戳（毫秒级和秒级）
+      // 开始时间戳：三天前的当前时刻
+      const startTimestamp = threeDaysAgoThisTime.getTime(); // 毫秒级
+      const startTimestampSec = Math.floor(startTimestamp / 1000); // 秒级
+      // 结束时间戳：当前时刻
+      const endTimestamp = now.getTime(); // 毫秒级
+      const endTimestampSec = Math.floor(endTimestamp / 1000); // 秒级
+
+      // 封装日期格式化函数，转换为yyyy-MM-dd HH:mm:ss格式
+      const formatDateTime = (date) => {
+        const y = date.getFullYear();
+        // 月份是从0开始的，所以要+1；补零确保是两位
+        const m = String(date.getMonth() + 1).padStart(2, '0');
+        const d = String(date.getDate()).padStart(2, '0');
+        const h = String(date.getHours()).padStart(2, '0');
+        const min = String(date.getMinutes()).padStart(2, '0');
+        const s = String(date.getSeconds()).padStart(2, '0');
+        return `${y}-${m}-${d} ${h}:${min}:${s}`;
+      };
+
+      // 格式化后的字符串：三天前的当前时刻 和 当前时刻
+      const startDateTimeStr = formatDateTime(threeDaysAgoThisTime);
+      const endDateTimeStr = formatDateTime(now);
+
+      return {
+        startTimestamp, // 三天前当前时刻的毫秒级时间戳
+        endTimestamp,   // 当前时刻的毫秒级时间戳
+        startTimestampSec, // 三天前当前时刻的秒级时间戳
+        endTimestampSec,    // 当前时刻的秒级时间戳
+        startDateTimeStr,   // yyyy-MM-dd HH:mm:ss格式的开始时间字符串
+        endDateTimeStr      // yyyy-MM-dd HH:mm:ss格式的结束时间字符串
+      };
+    },
    getDict() {
      getPdList().then(res => {
        this.searchBarFormConfig[1].selectOptions = res.data || [];
--- a/src/views/quality/dpdda/sectionDefect.vue
+++ b/src/views/quality/dpdda/sectionDefect.vue
@@ -152,7 +152,8 @@ export default {
          startPlaceholder: '开始时间',
          endPlaceholder: '结束时间',
          param: 'timeVal',
-          width: 350
+          width: 350,
+          defaultSelect: [],
        },
        {
          type: 'button',
@@ -225,11 +226,56 @@ export default {
  // 		deep: true
  // 	},
  // },
-  created() {
+  mounted() {
+
+    const { startTimestamp, endTimestamp } = this.getThreeDaysAgoThisTimeToNowTimeStamps();
+    // 找到时间范围的配置项并赋值（对应你代码中的timeVal参数）
+    this.searchBarFormConfig[2].defaultSelect = [startTimestamp, endTimestamp]; // 赋值给日期选择器
+    this.queryParams.startTime = startTimestamp;
+    this.queryParams.endTime = endTimestamp;
    this.getList();
    this.getDict()
  },
  methods: {
+    getThreeDaysAgoThisTimeToNowTimeStamps() {
+      const now = new Date();
+      // 1. 计算三天前的当前时刻（使用setDate直接修改日期，保留时分秒等信息）
+      const threeDaysAgoThisTime = new Date(now); // 复制当前日期对象，避免修改原对象
+      threeDaysAgoThisTime.setDate(threeDaysAgoThisTime.getDate() - 3); // 日期减3天，时分秒保持和当前一致
+
+      // 2. 获取时间戳（毫秒级和秒级）
+      // 开始时间戳：三天前的当前时刻
+      const startTimestamp = threeDaysAgoThisTime.getTime(); // 毫秒级
+      const startTimestampSec = Math.floor(startTimestamp / 1000); // 秒级
+      // 结束时间戳：当前时刻
+      const endTimestamp = now.getTime(); // 毫秒级
+      const endTimestampSec = Math.floor(endTimestamp / 1000); // 秒级
+
+      // 封装日期格式化函数，转换为yyyy-MM-dd HH:mm:ss格式
+      const formatDateTime = (date) => {
+        const y = date.getFullYear();
+        // 月份是从0开始的，所以要+1；补零确保是两位
+        const m = String(date.getMonth() + 1).padStart(2, '0');
+        const d = String(date.getDate()).padStart(2, '0');
+        const h = String(date.getHours()).padStart(2, '0');
+        const min = String(date.getMinutes()).padStart(2, '0');
+        const s = String(date.getSeconds()).padStart(2, '0');
+        return `${y}-${m}-${d} ${h}:${min}:${s}`;
+      };
+
+      // 格式化后的字符串：三天前的当前时刻 和 当前时刻
+      const startDateTimeStr = formatDateTime(threeDaysAgoThisTime);
+      const endDateTimeStr = formatDateTime(now);
+
+      return {
+        startTimestamp, // 三天前当前时刻的毫秒级时间戳
+        endTimestamp,   // 当前时刻的毫秒级时间戳
+        startTimestampSec, // 三天前当前时刻的秒级时间戳
+        endTimestampSec,    // 当前时刻的秒级时间戳
+        startDateTimeStr,   // yyyy-MM-dd HH:mm:ss格式的开始时间字符串
+        endDateTimeStr      // yyyy-MM-dd HH:mm:ss格式的结束时间字符串
+      };
+    },
    getDict() {
      getPdList().then(res => {
        this.searchBarFormConfig[1].selectOptions = res.data || [];
Author	SHA1	Message	Date
张昊鹏	a2375325a0	Merge pull request 'projects/qhd-line-zhp' (#467 ) from projects/qhd-line-zhp into projects/qhd-line-test Reviewed-on: #467	2025-12-23 08:52:44 +08:00
‘937886381’	04d5896f6e	Merge branch 'projects/qhd-line-test' into projects/qhd-line-zhp	2025-12-23 08:51:19 +08:00
‘937886381’	46a23c249c	修改	2025-12-23 08:49:37 +08:00
张昊鹏	242a52b98e	Merge pull request 'projects/qhd-line-zhp' (#465 ) from projects/qhd-line-zhp into projects/qhd-line-test Reviewed-on: #465	2025-12-17 16:30:08 +08:00
‘937886381’	945237557f	修改	2025-12-17 16:27:13 +08:00
‘937886381’	8eb0a9fee1	Merge branch 'projects/qhd-line-test' into projects/qhd-line-zhp	2025-12-15 10:48:29 +08:00
‘937886381’	a9645d03a9	修改bug	2025-12-15 10:46:44 +08:00
张昊鹏	2b5e476fdd	Merge pull request 'projects/qhd-line-zhp' (#464 ) from projects/qhd-line-zhp into projects/qhd-line-test Reviewed-on: #464	2025-12-12 16:57:01 +08:00
‘937886381’	f95d0473bf	Merge branch 'projects/qhd-line-test' into projects/qhd-line-zhp	2025-12-12 16:51:39 +08:00
‘937886381’	25dc76dfbe	修改bug	2025-12-12 16:50:46 +08:00
张昊鹏	cdeba3f334	Merge pull request '新增设备总览透光率产线产品监控等' (#462 ) from projects/qhd-line-zhp into projects/qhd-line-test Reviewed-on: #462	2025-12-12 14:50:32 +08:00