From 1240318c14c896cf5a779780b18b292784d54dd9 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期六, 22 六月 2024 10:26:52 +0800
Subject: [PATCH] 1.滚动条粗细修改2.下单单数禁用
---
src/views/kanbanManager/ckgl.vue | 2 +-
src/views/statistic/personSalaryList.vue | 4 ++--
src/styles/global.css | 30 +++++++++++++++---------------
src/views/workOrder/produceOrderList.vue | 1 +
src/views/kanbanManager/cj.vue | 4 ++--
5 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/styles/global.css b/src/styles/global.css
index 37c98ec..f461daf 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -179,22 +179,22 @@
瀹氫箟婊氬姩鏉￠珮瀹藉強鑳屾櫙
楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄
*/
-::-webkit-scrollbar {
- width: 7px;
- height: 7px;
- /*background-color: white;*/
- background-color: #f8f8fa;
-}
+/*::-webkit-scrollbar {*/
+/* width: 20px;*/
+/* height: 20px;*/
+/* !*background-color: white;*!*/
+/* background-color: #f8f8fa;*/
+/*}*/
-::-webkit-scrollbar-thumb {
- /*box-shadow: inset 0 0 0px white;*/
- box-shadow: inset 0 0 0px #f8f8fa;
- /*-webkit-box-shadow: inset 0 0 0px white;*/
- -webkit-box-shadow: inset 0 0 0px #f8f8fa;
- background-color: rgb(193, 193, 193);
- /*婊氬姩鏉＄殑鑳屾櫙棰滆壊*/
- border-radius: 20px;
-}
+/*::-webkit-scrollbar-thumb {*/
+/* !*box-shadow: inset 0 0 0px white;*!*/
+/* box-shadow: inset 0 0 0px #f8f8fa;*/
+/* !*-webkit-box-shadow: inset 0 0 0px white;*!*/
+/* -webkit-box-shadow: inset 0 0 0px #f8f8fa;*/
+/* background-color: rgb(193, 193, 193);*/
+/* !*婊氬姩鏉＄殑鑳屾櫙棰滆壊*!*/
+/* border-radius: 20px;*/
+/*}*/
/*瑙ｅ喅琛ㄦ牸鍥哄畾鍒楁椂鐨勫帇鏍峰紡闂*/
.el-table__fixed {
diff --git a/src/views/kanbanManager/cj.vue b/src/views/kanbanManager/cj.vue
index eafa9fb..6e863b6 100644
--- a/src/views/kanbanManager/cj.vue
+++ b/src/views/kanbanManager/cj.vue
@@ -251,14 +251,14 @@
})
}, 1000 * 50)
- const res5 = await WorkShopProduceBottomRightData({ wkshopcode: 'CJ001' })
+ const res5 = await WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode[0] })
this.RightBottom = res5.data
if (this.RightBottom.length > 0) {
loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
}
setInterval(() => {
- WorkShopProduceBottomRightData({ wkshopcode: 'CJ001' }).then(res5 => {
+ WorkShopProduceBottomRightData({ wkshopcode: this.wkshopcode[0] }).then(res5 => {
this.RightBottom = res5.data
if (this.RightBottom.length > 0) {
loadEcharts('cjzl04', cjzl04(this.RightBottom.map(i => i.name), this.RightBottom.map(i => i.cont)))
diff --git a/src/views/kanbanManager/ckgl.vue b/src/views/kanbanManager/ckgl.vue
index 1fcdc43..42dd102 100644
--- a/src/views/kanbanManager/ckgl.vue
+++ b/src/views/kanbanManager/ckgl.vue
@@ -22,7 +22,7 @@
<div style="height: 470px;">
<div class="smallTitle">
<svg-icon icon-class="cpdrk" class="svg_class" />
- 閲囪喘寰呭叆搴�
+ 鐢熶骇寰呭叆搴�
</div>
<div class="lineContent horn" style="height: 410px">
<el-table
diff --git a/src/views/statistic/personSalaryList.vue b/src/views/statistic/personSalaryList.vue
index 4d5e263..8893ae4 100644
--- a/src/views/statistic/personSalaryList.vue
+++ b/src/views/statistic/personSalaryList.vue
@@ -627,9 +627,9 @@
const value = Number(curr)
if (!isNaN(value)) {
// return prev + curr
- return Math.round(prev * 100) / 100 + Math.round(curr * 100) / 100
+ return Math.floor(Math.round(prev * 100) / 100 + Math.round(curr * 100) / 100)
} else {
- return Math.round(prev * 100) / 100
+ return Math.floor(Math.round(prev * 100) / 100)
}
}, 0)
diff --git a/src/views/workOrder/produceOrderList.vue b/src/views/workOrder/produceOrderList.vue
index 7132553..a210681 100644
--- a/src/views/workOrder/produceOrderList.vue
+++ b/src/views/workOrder/produceOrderList.vue
@@ -480,6 +480,7 @@
v-model="dialogForm.ordernum"
oninput="value=value.replace(/[^0-9.]/g,'')"
style="width: 200px"
+ disabled
/>
</el-form-item>
<el-form-item label="棰勮浜や粯鏃ユ湡" prop="saleOrderDeliveryDate">
--
Gitblit v1.9.3