From 7b76e5ccb27d25f20bae6a48665ca712e491c513 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 11 九月 2023 16:56:11 +0800
Subject: [PATCH] 生产看板 样式改版 2023-9-11
---
public/close.png | 0
public/confirm1.png | 0
public/confirm2.png | 0
src/assets/style/public.scss | 6 +-
public/confirm3.png | 0
public/tank.png | 0
public/btn1.png | 0
public/number.png | 0
src/components/AddIssue.vue | 85 +++++++++++++++++++++++++++---------------
9 files changed, 57 insertions(+), 34 deletions(-)
diff --git a/public/btn1.png b/public/btn1.png
index ab67d43..9085cf7 100644
--- a/public/btn1.png
+++ b/public/btn1.png
Binary files differ
diff --git a/public/close.png b/public/close.png
new file mode 100644
index 0000000..2b30e31
--- /dev/null
+++ b/public/close.png
Binary files differ
diff --git a/public/confirm1.png b/public/confirm1.png
index e23afe1..df5b9bf 100644
--- a/public/confirm1.png
+++ b/public/confirm1.png
Binary files differ
diff --git a/public/confirm2.png b/public/confirm2.png
index 7f0a74a..83c19fc 100644
--- a/public/confirm2.png
+++ b/public/confirm2.png
Binary files differ
diff --git a/public/confirm3.png b/public/confirm3.png
index 59acad2..e0fae67 100644
--- a/public/confirm3.png
+++ b/public/confirm3.png
Binary files differ
diff --git a/public/number.png b/public/number.png
index 45e09a3..dcfa631 100644
--- a/public/number.png
+++ b/public/number.png
Binary files differ
diff --git a/public/tank.png b/public/tank.png
index c60eb9f..1aec6ca 100644
--- a/public/tank.png
+++ b/public/tank.png
Binary files differ
diff --git a/src/assets/style/public.scss b/src/assets/style/public.scss
index fcc97b9..c50c4ff 100644
--- a/src/assets/style/public.scss
+++ b/src/assets/style/public.scss
@@ -50,7 +50,7 @@
border-radius: 8px;
/*婊氬姩鏉￠珮搴�*/
-webkit-appearance:none;
- background-color:#f2f2f22a;
+ background-color:#87878724;
}
/*瀹氫箟婊氬姩鏉¤建閬� 鍐呴槾褰�+鍦嗚*/
@@ -62,7 +62,7 @@
border-radius: 8px;
/*婊氬姩鏉＄殑鑳屾櫙棰滆壊*/
- background-color: #f2f2f22a;
+ background-color:#87878724;
}
/*瀹氫箟婊戝潡 鍐呴槾褰�+鍦嗚*/
@@ -74,5 +74,5 @@
border-radius: 8px;
/*婊氬姩鏉＄殑鑳屾櫙棰滆壊*/
- background-color:#939393;
+ background-color:#9393937a;
}
diff --git a/src/components/AddIssue.vue b/src/components/AddIssue.vue
index fcb6624..41c8c49 100644
--- a/src/components/AddIssue.vue
+++ b/src/components/AddIssue.vue
@@ -8,7 +8,12 @@
:show-close="false"
>
<div class="tank-box">
- <div slot="title" class="tac drawerHeader">鏂颁换鍔�</div>
+ <div slot="title" class="tac drawerHeader">
+ <span class="title-l">鏂颁换鍔�</span>
+ <span class="title-r" @click="closeClick">
+ <img src="../../public/close.png" />
+ </span>
+ </div>
<div class="dialog-content-box">
<div
style="
@@ -16,7 +21,6 @@
width: 100%;
height: 100%;
overflow: hidden;
- margin-bottom: 30px;
text-align: left;
"
>
@@ -85,10 +89,10 @@
style="
color: #fff;
font-size: 18px;
- font-weight: 700;
margin-bottom: 10px;
margin-top: 20px;
"
+ class="color_4efefa"
>
宸ヨ壓鍙傛暟
</div>
@@ -140,14 +144,12 @@
</div>
<div slot="footer" class="dialog-footer tac" style="overflow: hidden">
<template v-if="messageError">
- <div class="btn" style="margin-left: 220px" @click="confirmClick2">
+ <div class="btn" @click="confirmClick2">
<img src="../../public/confirm3.png" />
</div>
</template>
<template v-else>
- <div class="btn" @click="closeClick">
- <img src="../../public/btn1.png" />
- </div>
+
<div class="btn" v-if="showBtn == 1" @click="confirmClick1">
<img src="../../public/confirm3.png" />
</div>
@@ -163,7 +165,9 @@
<i class="el-icon-loading icon-loading" v-if="isLoading"/>
<img src="../../public/confirm1.png" />
</div>
-
+ <div class="btn" @click="closeClick">
+ <img src="../../public/btn1.png" />
+ </div>
</template>
</div>
<!-- <ErrorIssue ref="error" :messageError="messageError" @shutdown="shutdown"/> -->
@@ -203,7 +207,7 @@
data() {
return {
islook: false,
- showBtn: 1,
+ showBtn:1,
num: 0,
timer: null,
message: "璇风‘璁ょ敓浜у畨鍏紒",
@@ -256,6 +260,7 @@
this.islook = true;
} else {
this.islook = false;
+ // this.islook = true;
}
},
getDateObj(date, fmt) {
@@ -361,14 +366,14 @@
<style lang="scss" scoped>
.tank-box {
- width: 638px;
+ width: 783px;
height: 630px;
- padding: 0 20px;
background: url("../../public/tank.png") no-repeat center center / cover;
position: relative;
.dialog-footer {
position: absolute;
- bottom: 40px;
+ bottom: 30px;
+ width:94%;
}
}
.color_4efefa {
@@ -384,9 +389,10 @@
margin-bottom: 13px;
}
.title-box {
- width: 100%;
+ width: calc(100% - 160px);
height: auto;
overflow: hidden;
+ padding:0 80px;
.title-item {
width: 45%;
float: left;
@@ -400,11 +406,11 @@
}
.title-bng {
- height: 42px;
- line-height: 42px;
+ height: 52px;
+ line-height:52px;
span {
- width: calc(100% - 110px);
- height: 42px;
+ width: calc(100% - 120px);
+ height: 52px;
text-align: center;
display: inline-block;
background: url("../../public/number.png") no-repeat center center / cover;
@@ -439,9 +445,9 @@
padding: 0 !important;
}
.btn {
- width: 200px;
+ width: 150px;
height: auto;
- float: left;
+ float: right;
display: inline-block;
position:relative;
img {
@@ -449,14 +455,14 @@
}
.icon-loading{
font-size:19px;
- color:#4efefa;
+ color:#333;
position:absolute;
- line-height:2.7;
- left:18%;
+ line-height:3.4;
+ left:15%;
}
&:nth-of-type(1) {
- margin-right: 30px;
- margin-left: 110px;
+ // margin-right: 30px;
+ // margin-left: 110px;
}
}
::v-deep .el-tabs__content {
@@ -536,7 +542,7 @@
.dialog-content-box {
height: calc(100% - 200px);
// overflow: hidden;
- padding: 50px 20px 20px;
+ padding: 20px 0px 20px;
.el-form {
overflow: hidden;
}
@@ -570,12 +576,29 @@
font-weight: 600;
}
.drawerHeader {
- font-weight: 700;
- font-size: 20px;
- text-align: center;
- color: #fff;
- height: 35px;
- line-height: 35px;
+ width:98%;
+ margin:0 auto;
+ overflow:hidden;
+ .title-l{
+ width:25%;
+ float:left;
+ margin-left:30px;
+ font-size: 27px;
+ color: #fff;
+ height: 3.2vw;
+ line-height: 4.5vw;
+ }
+ .title-r{
+ width:60px;
+ float:right;
+ height: 60px;
+ line-height: 5vw;
+ cursor:pointer;
+ img{
+ display:inline-block;
+ width:100%;
+ }
+ }
.identify {
width: 80px;
height: 25px;
--
Gitblit v1.8.0