From db8f36b1d3f659ddb91ade9db990f87c2f1759f2 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 23 一月 2024 09:23:47 +0800
Subject: [PATCH] 修改
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 4 +-
jcdm-ui/src/views/main/da/paramCollection/index.vue | 18 +++++----
jcdm-ui/src/views/main/pr/tightenReport/index.vue | 58 +++++++++-------------------
3 files changed, 31 insertions(+), 49 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
index 745adeb..1bc21f6 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
+++ b/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);
}
diff --git a/jcdm-ui/src/views/main/da/paramCollection/index.vue b/jcdm-ui/src/views/main/da/paramCollection/index.vue
index 7721cd3..f997702 100644
--- a/jcdm-ui/src/views/main/da/paramCollection/index.vue
+++ b/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']"
diff --git a/jcdm-ui/src/views/main/pr/tightenReport/index.vue b/jcdm-ui/src/views/main/pr/tightenReport/index.vue
index 36f9cc4..edb177a 100644
--- a/jcdm-ui/src/views/main/pr/tightenReport/index.vue
+++ b/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璇锋眰鐨刄RL锛屼娇鐢ㄩ�夋嫨鐨勬棩鏈熻寖鍥翠綔涓烘煡璇㈠弬鏁�
- const url = `@/api/main/da/paramCollection/paramCollection?startDate=${this.dateRange[0]}&endDate=${this.dateRange[1]}`;
+ // async fetchData() {
+ // // 鏋勫缓API璇锋眰鐨刄RL锛屼娇鐢ㄩ�夋嫨鐨勬棩鏈熻寖鍥翠綔涓烘煡璇㈠弬鏁�
+ // const url = `@/api/main/da/paramCollection/paramCollection?startDate=${this.dateRange[0]}&endDate=${this.dateRange[1]}`;
+ //
+ // try {
+ // // 鍙戦�丄PI璇锋眰锛岃幏鍙栨煡璇㈢粨鏋�
+ // const response = await fetch(url);
+ // const data = await response.json();
+ // console.log(data); // 澶勭悊鏌ヨ缁撴灉锛屾瘮濡傚湪鎺у埗鍙拌緭鍑烘垨鏄剧ず鍦ㄩ〉闈笂
+ // } catch (error) {
+ // console.error('Error fetching data:', error);
+ // }
+ // },
+ // },
- try {
- // 鍙戦�丄PI璇锋眰锛岃幏鍙栨煡璇㈢粨鏋�
- 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 = [];
- // // 鏋勫缓鏌ヨ鏉′欢锛屼娇鐢≒aramCollection琛ㄧ殑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>
--
Gitblit v1.9.3