From 58e246019f9a022b0432b1e9a01798112117442e Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 26 七月 2024 16:38:37 +0800
Subject: [PATCH] 修改钢化版图颜色，调整报工管理样式
---
UI-Project/config.js | 8 ++--
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 6 +-
UI-Project/src/lang/zh.js | 37 ++++++++++++++++++
UI-Project/src/views/ReportWork/reportWork.vue | 22 +++++++----
UI-Project/src/utils/constants.js | 4 +-
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 10 ++--
6 files changed, 64 insertions(+), 23 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index 7df122b..b15a1a5 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,7 +1,7 @@
export default {
-// serverUrl: "10.153.19.150:88/api",
- serverUrl: "192.168.1.199:88/api",
- // serverUrl2: "10.153.19.150:88"
- serverUrl2: "192.168.1.199:88"
+ serverUrl: "10.153.19.150:88/api",
+// serverUrl: "192.168.1.199:88/api",
+ serverUrl2: "10.153.19.150:88"
+ // serverUrl2: "192.168.1.199:88"
//serverUrl:"res.abeim.cn"
}
\ No newline at end of file
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 21ceabd..724296e 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -419,5 +419,40 @@
allstatus: '鍏ㄩ儴鍏ュ簱鐘舵��',
completedquantity: '瀹屾垚鏁伴噺',
scrapquantity: '鎶ュ簾鏁伴噺',
- }
+ },
+ reportmanage:{
+ productiontime :'鐢熶骇鏃堕棿',
+ all :'鍏ㄩ儴',
+ completed :'瀹屽伐',
+ broke :'鐮存崯',
+ takeout :'鎷胯蛋',
+ dreportwork :'鏈姤宸�',
+ pendingwork :'寰呮姤宸�',
+ reportwork :'宸叉姤宸�',
+ incise :'鍒囧壊',
+ edging :'纾ㄨ竟',
+ steel :'閽㈠寲',
+ inquire :'鏌ヨ',
+ signingwork :'鎶ュ伐',
+ reporteam :'鎶ュ伐鐝粍',
+ reportingequipment :'鎶ュ伐璁惧',
+ line :'绾胯矾',
+ process :'宸ュ簭',
+ glassID :'鐜荤拑ID',
+ projectnumber :'宸ョ▼鍙�',
+ layoutID :'閽㈠寲鐗堝浘ID',
+ productiontime :'鐢熶骇鏃堕棿',
+ type :'绫诲瀷',
+ state :'鐘舵��',
+ processcards :'娴佺▼鍗�',
+ number :'搴忓彿',
+ layer :'灞�',
+ typebreakage :'鐮存崯绫诲瀷',
+ causebreakage :'鐮存崯鍘熷洜',
+ responsibleprocess :'璐ｄ换宸ュ簭',
+ responsiblepersonnel :'璐ｄ换浜哄憳',
+ responsibleteam :'璐ｄ换鐝粍',
+ responsibleequipment :'璐ｄ换璁惧',
+ remark :'澶囨敞',
+ },
}
\ No newline at end of file
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index 9a2423c..67d36d2 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,3 +1,3 @@
-export const WebSocketHost = "192.168.1.199";
-// export const WebSocketHost = "10.153.19.150";
+// export const WebSocketHost = "192.168.1.199";
+export const WebSocketHost = "10.153.19.150";
export const host = "88";
\ No newline at end of file
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 2d6988b..b9892b8 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -163,11 +163,11 @@
function getRectColora(state) {
switch (state) {
case 0:
- return '#d1edc4';
+ return '#7AC5CD';
case 1:
- return '#E6E6FA';
+ return '#95d475';
case -1:
- return '#dedfe0';
+ return '#CDAF95';
case 5:
return '#911005';
}
@@ -175,9 +175,9 @@
function getRectColorb(state) {
switch (state) {
case 3:
- return '#f8e3c5';
+ return '#eebe77';
case 4:
- return '#F0F8FF';
+ return '#CD6090';
case 5:
return '#911005';
}
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 742ba24..f5944a4 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -71,11 +71,11 @@
});
}
function getRectColora(state) {
- switch (state) {
+ switch (state) {
case 3:
- return '#f8e3c5';
+ return '#eebe77';
case 4:
- return '#F0F8FF';
+ return '#CD6090';
case 5:
return '#911005';
}
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index f28dac1..752226a 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -1,29 +1,33 @@
<template>
<div style="height: 600px;">
- <span class="demonstration">鐢熶骇鏃堕棿</span>
- <el-date-picker v-model="timeRange" type="daterange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
+ <div style="display: flex; flex-direction: row; align-items: center; margin-top: 20px;">
+ <span style="margin-left: 10px;" class="demonstration">鐢熶骇鏃堕棿</span>
+ <el-date-picker style="margin-left: 10px;" v-model="timeRange" type="daterange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" :default-time="defaultTime" />
- <el-select v-model="report.type" placeholder="娓呴�夋嫨绫诲瀷">
+ <el-select v-model="report.type" placeholder="娓呴�夋嫨绫诲瀷" style="margin-left: 10px;" >
<el-option label="鍏ㄩ儴" value="0"></el-option>
<el-option label="瀹屽伐" value="1"></el-option>
<el-option label="鐮存崯" value="2"></el-option>
<el-option label="鎷胯蛋" value="3"></el-option>
</el-select>
- <el-select v-model="report.status" placeholder="娓呴�夋嫨鐘舵��">
+ <el-select v-model="report.status" placeholder="娓呴�夋嫨鐘舵��" style="margin-left: 10px;" >
<el-option label="鍏ㄩ儴" value="0"></el-option>
<el-option label="鏈姤宸�" value="1"></el-option>
<el-option label="寰呮姤宸�" value="2"></el-option>
<el-option label="宸叉姤宸�" value="3"></el-option>
</el-select>
- <el-select v-model="report.workingProcedure" placeholder="娓呴�夋嫨宸ュ簭">
+ <el-select v-model="report.workingProcedure" placeholder="娓呴�夋嫨宸ュ簭" style="margin-left: 10px;" >
<el-option label="鍏ㄩ儴" value="0"></el-option>
<el-option label="鍒囧壊" value="1"></el-option>
<el-option label="纾ㄨ竟" value="2"></el-option>
<el-option label="閽㈠寲" value="3"></el-option>
</el-select>
- <el-button type="primary" @click="selectReportData()">鏌ヨ</el-button>
- <el-button type="success">鎶ュ伐</el-button>
- <el-table height="100%" ref="table" :data="reportData"
+ <el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">鏌ヨ</el-button>
+ <el-button type="success" style="margin-left: 10px;" >鎶ュ伐</el-button>
+ </div>
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
+ <el-table height="550" ref="table" :data="reportData"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="teamsGroupsName" align="center" label="鎶ュ伐鐝粍" min-width="120" />
<el-table-column prop="deviceName" align="center" label="鎶ュ伐璁惧" min-width="120" />
@@ -46,6 +50,8 @@
<el-table-column prop="responsibleEquipment" align="center" label="璐ｄ换璁惧" min-width="120" />
<el-table-column prop="remark" align="center" label="澶囨敞" min-width="120" />
</el-table>
+ </div>
+ </el-card>
</div>
</template>
<script setup>
--
Gitblit v1.8.0