Merge pull request 'projects/mesxc-dy' (#379 ) from projects/mesxc-dy into projects/mesxc-test

Reviewed-on: #379
Merge branch 'projects/mesxc-test' into projects/mesxc-dy
2024-04-29 17:00:48 +08:00 · 2024-04-29 16:58:15 +08:00 · 2024-04-29 16:57:45 +08:00 · 2024-04-29 09:04:59 +08:00 · 2024-04-28 17:10:28 +08:00 · 2024-04-28 17:04:22 +08:00
13 changed files with 198 additions and 83 deletions
--- a/src/views/quality/base/qualityIsra/index.vue
+++ b/src/views/quality/base/qualityIsra/index.vue
@@ -199,10 +199,9 @@ export default {
      this.queryParams.lineName = this.$route.query.lineName
      this.searchBarFormConfig[2].defaultSelect = this.$route.query.lineName
    }
-    if (this.$route.query.originalGlassOutputTime) {
-      console.log('你好', this.$route.query.originalGlassOutputTime)
-      this.queryParams.startTime = parseTime(new Date(Number(this.$route.query.originalGlassOutputTime)))
-      this.queryParams.endTime = parseTime(new Date(Number(this.$route.query.originalGlassOutputTime)))
+    if (this.$route.query.startTime && this.$route.query.endTime) {
+      this.queryParams.startTime = parseTime(new Date(Number(this.$route.query.startTime)))
+      this.queryParams.endTime = parseTime(new Date(Number(this.$route.query.endTime)))
      this.searchBarFormConfig[3].defaultSelect = [
        this.queryParams.startTime,
        this.queryParams.endTime,
--- a/src/views/quality/base/qualityScrapLog/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
@@ -1,11 +1,76 @@
 <!--
 * @Author: zhp
 * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-04-09 15:14:08
- * @LastEditors: zhp
+ * @LastEditTime: 2024-04-28 17:10:02
+ * @LastEditors: DY
 * @Description:
 -->
 <template>
+  <!-- <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="auto">
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <el-form-item label="工单号" prop="workOrderId">
+          <el-select filterable v-model="dataForm.workOrderId" placeholder="请选择工单号">
+            <el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="数量" prop="num">
+          <el-input v-model="dataForm.num" placeholder="请输入数量" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="报废时间" prop="logTime">
+          <el-date-picker style="width: 100%;" v-model="dataForm.logTime" type="datetime" value-format="timestamp"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <el-form-item label="产线" prop="lineId">
+          <el-select v-model="dataForm.lineId" placeholder="请选择产线" @change="getWorksectionById">
+            <el-option v-for="dict in lineList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="工段" prop="sectionId">
+          <el-select v-model="dataForm.sectionId" placeholder="请选择工段">
+            <el-option v-for="dict in sectionList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="报废原因" prop="detId">
+          <el-select v-model="dataForm.detId" placeholder="请选择报废原因" multiple>
+            <el-option v-for="dict in detList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="24">
+        <el-form-item label="描述" prop="description">
+          <el-input v-model="dataForm.description" type="textarea" :rows="4" placeholder="请输入描述" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-col :span="8">
+      <el-form-item label="来源" prop="source">
+        <el-select v-model="dataForm.source" placeholder="请选择来源">
+          <el-option v-for="dict in sourceList" :key="dict.id" :label="dict.name" :value="dict.id" />
+        </el-select>
+      </el-form-item>
+    </el-col>
+    <el-col :span="8">
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="dataForm.remark" placeholder="备注" />
+      </el-form-item>
+    </el-col>
+  </el-form> -->
 	<el-form
 		:model="dataForm"
 		:rules="dataRule"
@@ -164,17 +229,29 @@ export default {
 			teamList: [],
 			sectionList: [],
 			dataForm: {
-				id: undefined,
-				logTime: undefined,
-				detId: undefined,
-				workOrderId: null,
-				teamId: undefined,
-				num: undefined,
-				sectionId: undefined,
-				lineId: undefined,
-				description: undefined,
+        id: undefined,
+        logTime: undefined,
+        source: 2,
+        detId: undefined,
+        workOrderId: null,
+        teamId: undefined,
+        num: undefined,
+        sectionId:undefined,
+        lineId:undefined,
+        description:undefined,
+        // description: undefined,
+        remark: undefined
+				// id: undefined,
+				// logTime: undefined,
+				// detId: undefined,
+				// workOrderId: null,
+				// teamId: undefined,
+				// num: undefined,
+				// sectionId: undefined,
+				// lineId: undefined,
 				// description: undefined,
-				remark: undefined,
+				// // description: undefined,
+				// remark: undefined,
 			},
 			// materialList: [],
 			dataRule: {
--- a/src/views/quality/base/qualityScrapLog/index.vue
+++ b/src/views/quality/base/qualityScrapLog/index.vue
@@ -90,7 +90,7 @@ const tableProps = [
 	{
 		prop: 'source',
 		label: '来源',
-		filter: (val) => (val == 1 ? '平板端' : '网页端'),
+		filter: (val) => ['', '平板端', '网页端'][val],
 		width: 90,
 	},
 ];
--- a/src/views/quality/monitoring/originalGlassRetrace/index.vue
+++ b/src/views/quality/monitoring/originalGlassRetrace/index.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-08-01 14:55:51
 * @LastEditors: DY
- * @LastEditTime: 2024-04-26 09:58:51
+ * @LastEditTime: 2024-04-29 15:25:52
 * @Description:
 -->
 <template>
@@ -47,7 +47,7 @@
 		</el-form>
    <!-- <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
      :table-data="list"> -->
-    <base-table :max-height="tableH" :table-props="tableProps"
+    <base-table :max-height="tableH" :table-props="tableProps" :page="1" :limit="100"
      :table-data="list">
      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="220" label="缺陷操作" :method-list="tableBtn"
        @clickBtn="handleClick" />
@@ -142,6 +142,7 @@ const tableProps = [
 export default {
  // mixins: [basicPage],
  mixins: [tableHeightMixin],
+  name: 'originalGlassRetrace',
  data() {
    return {
      lineOptions: [],
@@ -282,12 +283,31 @@ export default {
    handleClick(raw) {
 			if (raw.type === 'detail1') {
        // 原片缺陷
+        // console.log('你好', raw.data._pageIndex)
+        // const tempArray = this?.list[raw.data._pageIndex]
+        // console.log('你好tempArray', tempArray)
+        // let startTime = raw.data.originalGlassOutputTime
+        // if (tempArray) {
+        //   startTime = tempArray.originalGlassOutputTime
+        // }
+        // console.log('你好', parseTime(raw.data.originalGlassOutputTime))
+        const startTime = new Date(raw.data.originalGlassOutputTime)
+        const endTime = new Date(raw.data.originalGlassOutputTime)
+        startTime.setHours(startTime.getHours() - 1)
+        startTime.setMinutes(0)
+        startTime.setSeconds(0)
+        endTime.setHours(endTime.getHours() + 1)
+        endTime.setMinutes(0)
+        // endTime.setSeconds(0)
+        // console.log('设置时间', startTime, parseTime(startTime))
+        // console.log('设置时间11', endTime, parseTime(endTime))
 				this.$router.push({
          path: '/quality/base/quality-isra',
          query: {
            // deepProcessingLineId: raw.data.deepProcessingLineId,
            lineName: raw.data.deepProcessingLineName,
-            originalGlassOutputTime: raw.data.originalGlassOutputTime
+            endTime: endTime,
+            startTime: startTime
          },
        });
 			} else {
@@ -328,7 +348,11 @@ export default {
      } else {
        if (this.useTime === true) {
          if (this.listQuery.packTime !== null && this.listQuery.packTime !== '' && this.listQuery.lineName !== null && this.listQuery.lineName !== '') {
-            getOriginalGlassRetrace({ ...this.listQuery }).then(res => {
+
+            getOriginalGlassRetrace({
+              lineNameList: [this.listQuery.lineName],
+               ...this.listQuery
+            }).then(res => {
              console.log(res);
              this.list = res.data || []
              console.log(this.list);
--- a/src/views/quality/monitoring/qualityInspectionRecord/index.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
@@ -278,7 +278,7 @@ export default {
 					prop: 'source',
 					label: '来源',
 					width: 80,
-					filter: (val) => (val == 1 ? '平板端' : '网页端'),
+					filter: (val) => ['', '平板端', '网页端'][val],
 				},
 			],
 			// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
--- a/src/views/report/Environmental/sectionProduction/index.vue
+++ b/src/views/report/Environmental/sectionProduction/index.vue
@@ -382,9 +382,17 @@ export default {
 						obj.lineName = data[i].lineName;
 						obj.procedure = data[i].productDet[j].name;
 						data[i].productDet[j].data.map((item) => {
-							obj[item.timeStr] = item.input || null;
+							obj[item.timeStr] = item.output
+								? item.output
+								: item.input
+								? item.input
+								: null;
 						});
-						obj.sum = data[i].productDet[j].allInput;
+						obj.sum = data[i].productDet[j].allOutput
+							? data[i].productDet[j].allOutput
+							: data[i].productDet[j].allInput
+							? data[i].productDet[j].allInput
+							: null;
 						this.tableData2.push(obj);
 					}
 				}
--- a/src/views/report/glass/inputTable.vue
+++ b/src/views/report/glass/inputTable.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: Do not edit
 * @Date: 2023-12-13 14:10:04
- * @LastEditTime: 2024-04-23 16:47:21
+ * @LastEditTime: 2024-04-26 15:59:39
 * @LastEditors: DY
 * @Description:
 -->
@@ -38,15 +38,15 @@
 import { updateGlass, updateGlassRemark } from '@/api/report/glass';

 const cols = [
+  {
+    prop: 'lineName',
+    label: '生产线',
+  },
  {
 		prop: 'xc',
 		label: '许昌安彩周原片生产汇总',
-		align: 'center',
+		// align: '200px',
 		children: [
-			{
-				prop: 'lineName',
-				label: '生产线',
-			},
 			{
 				prop: 'm',
 				label: '拉引量㎡',
@@ -181,9 +181,9 @@ const cols = [
        deep: true,
        handler(newv, oldv) {
          if (newv[0] !== '' && newv[0] !== undefined) {
-            this.cols[0].label = this.date + '(' + newv[0] + '-' + newv[1] + ')'
+            this.cols[1].label = this.date + '(' + newv[0] + '-' + newv[1] + ')'
          } else {
-            this.cols[0].label = this.date
+            this.cols[1].label = this.date
          }
        }
      },
@@ -208,15 +208,15 @@ const cols = [
            text2 = '上年'
            text3 = '原片合计（片/年）'
          }
-          this.cols[0].children[1].children[0].label = text1
-          this.cols[0].children[1].children[1].label = text2
-          this.cols[0].children[2].children[0].label = text1
-          this.cols[0].children[2].children[1].label = text2
-          this.cols[0].children[3].children[0].label = text1
-          this.cols[0].children[3].children[1].label = text2
-          this.cols[0].children[4].children[0].label = text1
-          this.cols[0].children[4].children[1].label = text2
-          this.cols[0].children[2].label = text3
+          this.cols[1].children[0].children[0].label = text1
+          this.cols[1].children[0].children[1].label = text2
+          this.cols[1].children[1].children[0].label = text1
+          this.cols[1].children[1].children[1].label = text2
+          this.cols[1].children[2].children[0].label = text1
+          this.cols[1].children[2].children[1].label = text2
+          this.cols[1].children[3].children[0].label = text1
+          this.cols[1].children[3].children[1].label = text2
+          this.cols[1].children[1].label = text3
        }
      }
    },
--- a/src/views/report/ingredientReport/day.vue
+++ b/src/views/report/ingredientReport/day.vue
@@ -23,7 +23,7 @@
    }" class="baseTable" :span-method="objectSpanMethod" :data="tableData" style="width: 100%">
      <el-table-column align="center" prop="" :label=" '配料日报' + time " width="120">
        <el-table-column label="原料样式" align="right" width="150">
-          <el-table-column prop="className" label="时间" width="120">
+          <el-table-column prop="className" label="时间" width="150">
          </el-table-column>
        </el-table-column>
        <el-table-column align="center" prop="putType" label="" width="180">
@@ -32,8 +32,7 @@
        <el-table-column prop="activityName"></el-table-column>
        <el-table-column prop="message"></el-table-column>
      </el-table-column> -->
-        <el-table-column align="center" style="text-align: center;" v-for="(item, index) in codeList " :prop="item"
-          :label="item">
+        <el-table-column align="center" style="text-align: center;" v-for="(item, index) in codeList " :key="index" :prop="item"  :label="item">
          <!-- <template slot-scope="scope">
          <el-col :span="12">
            {{ codeList[index] }}
@@ -170,7 +169,7 @@ export default {
  mounted() {
    // this.formConfig[1].defaultSelect[]
    this.listQuery.startTime = Date.now()
-    this.time = moment(new Date((Date.now())).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now() + 24*60*60*1000).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss')
+    this.time = moment(new Date((Date.now())).setHours(8, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now() + 24*60*60*1000).setHours( 7, 59, 59)).format('YYYY-MM-DD HH:mm:ss')
    this.listQuery.endTime = Date.now()
    // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
    this.getDataList()
@@ -579,14 +578,14 @@ export default {
  content: '';
  position: absolute;
  width: 1px;
-  height: 75px;
+  height: 90px;
  /*这里需要自己调整，根据td的宽度和高度*/
  top: 0;
  left: 0;
  background-color: grey;
  opacity: 0.3;
  display: block;
-  transform: rotate(-53deg);
+  transform: rotate(-60deg);
  /*这里需要自己调整，根据线的位置*/
  transform-origin: top;
 }
@@ -595,14 +594,14 @@ export default {
  content: '';
  position: absolute;
  width: 1px;
-  height: 75px;
+  height: 90px;
  /*这里需要自己调整，根据td的宽度和高度*/
  bottom: 0;
  right: 0;
  background-color: grey;
  opacity: 0.3;
  display: block;
-  transform: rotate(-54deg);
+  transform: rotate(-60deg);
  /*这里需要自己调整，根据线的位置*/
  transform-origin: bottom;
 }
--- a/src/views/report/productionWeekReport/index.vue
+++ b/src/views/report/productionWeekReport/index.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-24 15:29:21
+ * @LastEditTime: 2024-04-26 16:01:20
 * @LastEditors: DY
 * @Description:
 -->
@@ -32,13 +32,19 @@
      background: '#F2F4F9',
      color: '#606266'
    }">
-      <el-table-column :label="'许昌安彩周成品生产汇总' + '(' + timeTips + ')'" align="center">
-        <el-table-column prop="lineId" label="生产线" align="center">
+      <el-table-column prop="lineId" label="生产线" align="center">
+        <template slot-scope="scope">
+          <el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
+          <span v-else>{{ scope.row.lineName }} </span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="'许昌安彩周成品生产汇总' + '(' + timeTips + ')'">
+        <!-- <el-table-column prop="lineId" label="生产线" align="center">
          <template slot-scope="scope">
            <el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
            <span v-else>{{ scope.row.lineName }} </span>
          </template>
-        </el-table-column>
+        </el-table-column> -->
        <el-table-column label="投入数㎡" align="center">
          <el-table-column prop="inputNow" label="本周" align="center">
            <template slot-scope="scope">
--- a/src/views/report/qcReport/cutDayReport/index.vue
+++ b/src/views/report/qcReport/cutDayReport/index.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-25 17:13:14
- * @LastEditors: zhp
+ * @LastEditTime: 2024-04-26 15:22:57
+ * @LastEditors: DY
 * @Description:
 -->
 <template>
@@ -12,14 +12,14 @@
      background: '#F2F4F9',
      color: '#606266'
    }" class="baseTable" :max-height="tableH" id="exportTable" :data="tableData" style="width: 100%">
-      <el-table-column v-for="item in tableProps" :prop="item.prop" :label="item.label" align="center">
-        <el-table-column v-for="it in item.children" :prop="it.prop" :label="it.label" align="center">
+      <el-table-column v-for="(item, index) in tableProps" :key="index" :prop="item.prop" :label="item.label" align="center">
+        <el-table-column v-for="(it, indexNo) in item.children" :key="indexNo" :prop="it.prop" :label="it.label" align="center">
        </el-table-column>
      </el-table-column>
    </el-table>
    <el-table class="baseTable" :max-height="tableH" id="exportTableChild" :data="tableDataChild" style="width: 100%">
-      <el-table-column v-for="item in tablePropsChild" :prop="item.prop" :label="item.label" align="center">
-        <el-table-column v-for="it in item.children" :prop="it.prop" :label="it.label" align="center">
+      <el-table-column v-for="(item, indexn) in tablePropsChild" :key="indexn" :prop="item.prop" :label="item.label" align="center">
+        <el-table-column v-for="(it, indexi) in item.children" :key="indexi" :prop="it.prop" :label="it.label" align="center">
        </el-table-column>
      </el-table-column>
    </el-table>
@@ -167,7 +167,7 @@ export default {
      listQuery: {
        startTime: undefined,
        endTime: undefined,
-        lineId: null,
+        lineId: undefined,
      },
      formConfig: [
        // {
@@ -189,7 +189,7 @@ export default {
          type: 'datePicker',
          label: '时间段',
          dateType: 'daterange',
-          format: 'yyyy-MM-dd HH:mm:ss',
+          format: 'yyyy-MM-dd',
          valueFormat: "timestamp",
          rangeSeparator: '-',
          startPlaceholder: '开始时间',
@@ -205,6 +205,7 @@ export default {
          labelField: 'name',
          valueField: 'id',
          param: 'lineId',
+          // multiple:true,
          filterable: true
        },
        {
--- a/src/views/report/qcReport/fullInspection/index.vue
+++ b/src/views/report/qcReport/fullInspection/index.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-26 09:10:53
- * @LastEditors: zhp
+ * @LastEditTime: 2024-04-26 16:12:51
+ * @LastEditors: DY
 * @Description:
 -->
 <template>
@@ -49,7 +49,7 @@
    <el-table :header-cell-style="{
      background: '#F2F4F9',
      color: '#606266'
-    }" class=" baseTable" :data="tableData" style="width: 100%">
+    }" id="exportTable" class="baseTable" :data="tableData" style="width: 100%">
      <el-table-column label="时间" align="right" width="150">
        <el-table-column prop="name" label="缺陷" width="120">
        </el-table-column>
@@ -60,7 +60,7 @@
        <el-table-column prop="activityName"></el-table-column>
        <el-table-column prop="message"></el-table-column>
      </el-table-column> -->
-      <el-table-column v-for="(item, index) in codeList " :prop="item.prop" :label="item.label">
+      <el-table-column v-for="(item, index) in codeList " :key="index" :prop="item.prop" :label="item.label">
      </el-table-column>
    </el-table>
    <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@@ -244,7 +244,7 @@ export default {
    // this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
    // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
    this.listQuery.startTime = new Date()
-    this.getDataList()
+    // this.getDataList()
    this.getDict()
    // this.getSpanArr(this.tableData)
    // this.getDict();
@@ -310,6 +310,7 @@ export default {
            //设置导出文件名称
            "全检检验记录.xlsx"
          );
+          this.$message.success('导出成功');
        } catch (e) {
          if (typeof console !== "undefined") console.log(e, wbout);
        }
@@ -349,7 +350,7 @@ export default {
        let arr = []
        console.log(res.data)

-        res.data.timeStrList.push('不良合计')
+        res.data?.timeStrList.push('不良合计')
        this.codeList = res.data.timeStrList.map((ele, index) => {
          if (ele === '不良合计') {
            return {
--- a/src/views/report/qcReport/lineReport.vue
+++ b/src/views/report/qcReport/lineReport.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-26 09:42:54
- * @LastEditors: zhp
+ * @LastEditTime: 2024-04-26 15:31:24
+ * @LastEditors: DY
 * @Description:
 -->
 <template>
@@ -13,8 +13,7 @@
      color: '#606266'
    }" class="baseTable" border :max-height="tableH" id="exportTable" :data="tableData" style="width: 100%"
      :span-method="objectSpanMethod">
-      <el-table-column :width="item.width" v-for="item in tableProps" :prop="item.prop" :label="item.label"
-        align="center">
+      <el-table-column :width="item.width" v-for="(item, index) in tableProps" :key="index" :prop="item.prop" :label="item.label" align="center">
      </el-table-column>
    </el-table>
    <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@@ -51,7 +50,7 @@ const tableProps = [
  // },
  {
    prop: 'lineName',
-    label: '产线',
+    label: '生产线',
    width:'100'
  },
  {
@@ -104,7 +103,7 @@ export default {
      listQuery: {
        startTime: undefined,
        endTime: undefined,
-        lineId:null,
+        lineId:undefined,
      },
      formConfig: [
        // {
@@ -132,7 +131,7 @@ export default {
          startPlaceholder: '开始时间',
          endPlaceholder: '结束时间',
          param: 'checkTime',
-          defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime(), new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000],
+          defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000, new Date(new Date(Date.now()).setHours(6, 59, 59, 0)).getTime()],
          width: 350
        },
        {
@@ -142,6 +141,7 @@ export default {
          labelField: 'name',
          valueField: 'id',
          param: 'lineId',
+          multiple:true,
          filterable: true
        },
        {
@@ -170,8 +170,8 @@ export default {
  created() { },
  mounted() {
    // this.formConfig[1].defaultSelect[]
-    this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime()
-    this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000
+    this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000
+    this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()
    // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
    this.getDataList()
    this.getDict()
@@ -365,8 +365,8 @@ export default {
          // this.listQuery.materialId = val.materialId ? val.materialId : undefined;
          // this.listQuery.startTime = '1706144404000';
          // this.listQuery.endTime = '1706230804000';
-          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined;
-          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000 : undefined;
+          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000 : undefined;
+          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() : undefined;
          this.listQuery.lineId = val.lineId ? val.lineId : undefined
          this.getDataList();
          break;
--- a/src/views/report/qcReport/optimizeCutData.vue
+++ b/src/views/report/qcReport/optimizeCutData.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-18 15:07:53
- * @LastEditTime: 2024-04-26 09:41:54
- * @LastEditors: zhp
+ * @LastEditTime: 2024-04-26 15:20:45
+ * @LastEditors: DY
 * @Description:
 -->
 <template>
@@ -12,8 +12,7 @@
      background: '#F2F4F9',
      color: '#606266'
    }" class="baseTable" border id="exportTable" :data="tableData" style="width: 100%" :span-method="objectSpanMethod">
-      <el-table-column :width="item.width" v-for="item in tableProps" :prop="item.prop" :label="item.label"
-        align="center">
+      <el-table-column :width="item.width" v-for="(item, index) in tableProps" :key="index" :prop="item.prop" :label="item.label" align="center">
      </el-table-column>
    </el-table>
    <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@@ -56,7 +55,7 @@ const tableProps = [
  },
  {
    prop: 'dataType',
-    label: '类别',
+    label: '类型',
    width: '150',
  },
  {
@@ -146,6 +145,7 @@ export default {
          labelField: 'name',
          valueField: 'id',
          param: 'lineId',
+          multiple:true,
          filterable: true
        },
        {
Author	SHA1	Message	Date
hellody	1c7c10205e	Merge pull request 'projects/mesxc-dy' (#379 ) from projects/mesxc-dy into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #379	2024-04-29 17:00:48 +08:00
helloDy	74003e9d89	Merge branch 'projects/mesxc-test' into projects/mesxc-dy	2024-04-29 16:58:15 +08:00
helloDy	cb72e2b68a	bug	2024-04-29 16:57:45 +08:00
juzi	025b061ec2	Merge pull request 'projects/mesxc-dy' (#378 ) from projects/mesxc-dy into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #378	2024-04-29 09:04:59 +08:00
helloDy	f2912eaee1	merge	2024-04-28 17:10:28 +08:00
helloDy	8025d00709	原片时间，bug	2024-04-28 17:04:22 +08:00
juzi	60edd8f2c4	Merge pull request 'projects/mesxc-zjl' (#377 ) from projects/mesxc-zjl into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #377	2024-04-27 10:46:40 +08:00
juzi	c0214c9eb7	24包装	2024-04-27 10:45:20 +08:00
juzi	da85e5211a	Merge branch 'projects/mesxc-test' into projects/mesxc-zjl	2024-04-26 16:44:55 +08:00
juzi	d0adf3a63e	Merge pull request '报表确认, bug' (#376 ) from projects/mesxc-dy into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #376	2024-04-26 16:40:31 +08:00
helloDy	b81c95f796	报表确认, bug	2024-04-26 16:14:47 +08:00
juzi	e7f21456a3	Merge pull request 'projects/mesxc-zhp' (#375 ) from projects/mesxc-zhp into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #375	2024-04-26 13:59:41 +08:00
‘937886381’	1537b1be58	Merge branch 'projects/mesxc-test' into projects/mesxc-zhp	2024-04-26 10:51:48 +08:00
‘937886381’	b2304941a4	修改bug	2024-04-26 10:51:24 +08:00