jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
@@ -41,7 +41,7 @@ @GetMapping("/list") public TableDataInfo list(BsOrderScheduling bsOrderScheduling) { // startPage(); startPage(); List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling); return getDataTable(list); } @@ -50,7 +50,7 @@ @GetMapping("/list2") public TableDataInfo list2(BsOrderScheduling bsOrderScheduling) { // startPage(); // startPage(); List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling); return getDataTable(list); } jcdm-ui/src/views/main/da/paramCollection/index.vue
@@ -73,9 +73,8 @@ <el-table v-loading="loading" border :data="paramCollectionList" @selection-change="handleSelectionChange" v-if="paramCollectionList.length > 0"> <el-table-column type="selection" width="55" align="center" /> <el-table-column label="主键id" align="center" prop="id" /> <el-table-column label="工单编号" align="center" prop="workOrderNo"></el-table-column> <el-table-column label="总成序列号" align="center" width="100" prop="sfcCode"></el-table-column> <el-table-column label="总成序列号" align="center" width="140" prop="sfcCode" ></el-table-column> <el-table-column label="产品编号" align="center" prop="productCode"></el-table-column> <el-table-column label="产线编号" align="center" prop="productionLine"></el-table-column> <el-table-column label="工位编号" align="center" prop="locationCode"></el-table-column> @@ -84,28 +83,31 @@ <el-table-column label="参数值" align="center" prop="paramValue"></el-table-column> <el-table-column label="参数上限" align="center" prop="paramUpper"></el-table-column> <el-table-column label="参数下限" align="center" prop="paramLower"></el-table-column> <el-table-column label="标准值" align="center" prop="paramStandard"></el-table-column> <el-table-column label="采集时间" align="center" prop="collectionTime" width="180"> <el-table-column label="采集时间" align="center" prop="collectionTime" width="100"> <template slot-scope="scope"> <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d}') }}</span> </template> </el-table-column> <el-table-column label="状态" align="center" prop="state"></el-table-column> <el-table-column label="参数名称" align="center" prop="paramName"></el-table-column> <el-table-column label="参数名称" align="center" prop="paramName" width="150" ></el-table-column> <el-table-column label="单位" align="center" prop="unit"></el-table-column> <el-table-column label="类型" align="center" prop="type"></el-table-column> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" > <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width" > <template slot-scope="scope"> <el-button size="mini" type="text" type="success" plain style="width: 72px" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['main:paramCollection:edit']" >修改</el-button> <el-button size="mini" type="text" type="danger" plain style="width: 72px" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['main:paramCollection:remove']" jcdm-ui/src/views/main/pr/tightenReport/index.vue
@@ -14,7 +14,6 @@ placeholder="请输入工位号" @keyup.enter.native="handleQuery"/> </el-form-item> <el-form-item label-width="120" label="采集时间" prop="startDate"> <el-date-picker v-model="dateRange" @@ -23,7 +22,6 @@ start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker> <button @click="fetchData">查询</button> </el-form-item> <el-form-item style="float: right"> <el-button type="primary" icon="el-icon-refresh" @click="handleQuery">查询</el-button> @@ -119,24 +117,24 @@ created() { this.getList(); }, methods:{ methods: { async fetchData() { // 构建API请求的URL，使用选择的日期范围作为查询参数 const url = `@/api/main/da/paramCollection/paramCollection?startDate=${this.dateRange[0]}&endDate=${this.dateRange[1]}`; // async fetchData() { // // 构建API请求的URL，使用选择的日期范围作为查询参数 // const url = `@/api/main/da/paramCollection/paramCollection?startDate=${this.dateRange[0]}&endDate=${this.dateRange[1]}`; // // try { // // 发送API请求，获取查询结果 // const response = await fetch(url); // const data = await response.json(); // console.log(data); // 处理查询结果，比如在控制台输出或显示在页面上 // } catch (error) { // console.error('Error fetching data:', error); // } // }, // }, try { // 发送API请求，获取查询结果 const response = await fetch(url); const data = await response.json(); console.log(data); // 处理查询结果，比如在控制台输出或显示在页面上 } catch (error) { console.error('Error fetching data:', error); } }, }, reset() { reset() { this.form = { id: null, workOrderNo: null, @@ -177,31 +175,12 @@ // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) this.single = selection.length!==1 this.single = selection.length !== 1 this.multiple = !selection.length }, getList() { this.loading = true; // const startDate = new Date(this.queryParams.startDate); // const endDate = new Date(this.queryParams.endDate); // const resultList = []; // // 构建查询条件，使用ParamCollection表的createtime作为判断条件 // const query = { // createTime: date // 使用当前日期作为查询条件 // }; // for (let date = startDate; date <= endDate; date.setDate(date.getDate() + 1)) { // // 根据当前日期执行查询操作，并将结果添加到结果数组中 // listParamCollection(query).then(response => { // resultList.push(...response.rows); // // 判断是否是最后一个日期，如果是，则更新页面数据 // if (date.getTime() === endDate.getTime()) { // this.tightenReportList = resultList; // this.total = resultList.length; // this.loading = false; // } // }); // } listParamCollection(this.queryParams).then(response => { this.tightenReportList = response.rows; this.total = response.total; @@ -209,8 +188,9 @@ }); }, }, } </script> <style scoped>
