From c80c6b24a0d76321780d71c2d4249f5144693096 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期二, 23 一月 2024 11:16:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 10 ++
jcdm-ui/src/views/dashboard/PieChart.vue | 2
jcdm-ui/src/views/index.vue | 16 ++++
jcdm-ui/src/views/main/cfkb/Instructions/index.vue | 3
jcdm-ui/src/views/main/da/paramCollection/index.vue | 18 +++--
jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 4
jcdm-ui/src/views/dashboard/PanelGroup.vue | 35 ++++++++---
jcdm-ui/src/views/main/pr/tightenReport/index.vue | 58 ++++++-------------
8 files changed, 80 insertions(+), 66 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..b65b7ee 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
@@ -1,7 +1,10 @@
package com.jcdm.main.bs.orderScheduling.controller;
+import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.jcdm.common.utils.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -41,7 +44,7 @@
@GetMapping("/list")
public TableDataInfo list(BsOrderScheduling bsOrderScheduling)
{
-// startPage();
+ startPage();
List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
return getDataTable(list);
}
@@ -51,7 +54,10 @@
public TableDataInfo list2(BsOrderScheduling bsOrderScheduling)
{
// startPage();
- List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
+ List<BsOrderScheduling> list = new ArrayList<>();
+ if (StringUtils.isNotEmpty(bsOrderScheduling.getOrderNo())){
+ list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
+ }
return getDataTable(list);
}
diff --git a/jcdm-ui/src/views/dashboard/PanelGroup.vue b/jcdm-ui/src/views/dashboard/PanelGroup.vue
index 7301305..29156b6 100644
--- a/jcdm-ui/src/views/dashboard/PanelGroup.vue
+++ b/jcdm-ui/src/views/dashboard/PanelGroup.vue
@@ -1,6 +1,10 @@
<template>
<el-row :gutter="40" class="panel-group">
- <div class="top2">鍗曟棩绱浜ч噺</div>
+ <el-card class="bottom-card">
+ <div slot="header" class="clearfix">
+ <span class="top2">鍗曟棩绱浜ч噺</span>
+ </div>
+
<el-col :xs="12" :sm="12" :lg="4" class="card-panel-col">
<div class="card-panel" @click="handleSetLineChartData('newVisitis')">
<div class="card-panel-icon-wrapper icon-people">
@@ -10,7 +14,7 @@
<div class="card-panel-text">
鍚堢涓婄嚎
</div>
- <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
+ <count-to :start-val="0" :end-val="10200" :duration="2600" class="card-panel-num" />
</div>
</div>
</el-col>
@@ -82,7 +86,7 @@
</div>
</el-col>
-
+ </el-card>
</el-row>
</template>
@@ -103,15 +107,25 @@
</script>
<style lang="scss" scoped>
+.bottom-card{
+ padding: 15px 20px 20px 20px;
+ height: auto;
+ width: 1272px;
+ margin-left: 20px;
+ justify-content: center;
+ column-width: max-content;
+}
+
.top2{
- font-size: 26px;
+ font-size: 18px;
font-weight: bold;
- margin-bottom: 16px;
+ margin-bottom: 0px;
}
.panel-group {
- margin-top: 18px;
+ width: 1272px;
+ margin-left: 20px;
.card-panel-col {
margin-bottom: 32px;
}
@@ -183,16 +197,17 @@
font-weight: bold;
margin: 26px;
margin-left: 0px;
+ padding: 20px 20px;
.card-panel-text {
- line-height: 18px;
+ line-height: 14px;
color: rgba(0, 0, 0, 0.45);
- font-size: 16px;
- margin-bottom: 12px;
+ font-size: 12px;
+ margin-bottom: 9px;
}
.card-panel-num {
- font-size: 20px;
+ font-size: 18px;
}
}
}
diff --git a/jcdm-ui/src/views/dashboard/PieChart.vue b/jcdm-ui/src/views/dashboard/PieChart.vue
index 167711d..b831efc 100644
--- a/jcdm-ui/src/views/dashboard/PieChart.vue
+++ b/jcdm-ui/src/views/dashboard/PieChart.vue
@@ -20,7 +20,7 @@
},
height: {
type: String,
- default: '300px'
+ default: '350px'
}
},
data() {
diff --git a/jcdm-ui/src/views/index.vue b/jcdm-ui/src/views/index.vue
index fc6881d..37ff1f2 100644
--- a/jcdm-ui/src/views/index.vue
+++ b/jcdm-ui/src/views/index.vue
@@ -5,10 +5,16 @@
<el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
<el-col :xs="24" :sm="12">
- <pie-chart />
+ <el-card>
+ <pie-chart />
+ </el-card>
</el-col>
+
<el-col :xs="24" :sm="12">
- <line-chart :chart-data="lineChartData" />
+ <el-card>
+ <line-chart :chart-data="lineChartData" />
+ </el-card>
+
</el-col>
</el-row>
@@ -19,6 +25,7 @@
import PanelGroup from './dashboard/PanelGroup'
import LineChart from './dashboard/LineChart'
import PieChart from './dashboard/PieChart'
+import pieChart from "@/views/dashboard/PieChart.vue";
const lineChartData = {
newVisitis: {
@@ -41,6 +48,11 @@
export default {
name: 'Index',
+ computed: {
+ pieChart() {
+ return pieChart
+ }
+ },
components: {
PanelGroup,
LineChart,
diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index 3117645..706695b 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -242,7 +242,7 @@
<!-- <el-table-column label="澶囨敞" align="center" prop="remarks">-->
<!-- </el-table-column>-->
- <el-table-column fixed="right" width="200" 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"
@@ -263,7 +263,7 @@
v-hasPermi="['bs:orderScheduling:remove']"
>鍒犻櫎</el-button>
</template>
- </el-table-column>
+ </el-table-column>-->
</el-table>
</el-card>
diff --git a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
index 8e5781f..7c57df7 100644
--- a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
+++ b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
@@ -74,13 +74,12 @@
title="宸ヨ壓鏂囦欢"
:visible.sync="dialogVisible"
width="70%"
- lock-scroll="false"
@close="closeMethod"
>
<div><el-image style="height: 1090px;width: 960px;margin-left: 33px" :src="mainProcessSrc"></el-image></div>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="dialogVisible = false">纭� 瀹�</el-button>
+ <el-button type="primary" @click="dialogVisible = false" style="margin-right: 80px">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
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