-
废液回收状态
-
-
-
-
- 50%
-
- 碱中和容器
-
+
+
废液回收状态
+
+
+
+
+ 50%
+
+ 碱中和容器
-
溶液容器状态
+ 溶液容器状态
-
+
-
+
{{ solu.percentage }}
@@ -57,60 +55,48 @@
percentage: '50%',
color:"#cf67e7"
},{
- id : 1,
+ id : 6,
name: '硫酸',
percentage: '10%',
color:"#cf67e7"
},{
- id : 2,
+ id : 7,
name: '硫酸',
percentage: '20%',
color:"#07a16e"
},{
- id : 3,
+ id : 8,
name: '硫酸',
percentage: '30%',
- },{
- id : 4,
- name: '硫酸',
- percentage: '40%',
- color:"#cf67e7"
- },{
- id : 5,
- name: '硫酸',
- percentage: '50%',
- color:'#3586c6'
}])
\ No newline at end of file
diff --git a/src/views/graphite/index.vue b/src/views/graphite/index.vue
index 697b8d7..b2e4279 100644
--- a/src/views/graphite/index.vue
+++ b/src/views/graphite/index.vue
@@ -1,5 +1,5 @@
-
+
-
-
+
- 开门
-
+开门
开始任务
@@ -22,7 +19,6 @@
结束任务
-
选择配方
@@ -31,7 +27,6 @@
执行配方
-
添加溶液
@@ -40,9 +35,8 @@
摇匀
-
-
+
移至加热
@@ -52,7 +46,6 @@
移至特殊
-
开始加热
@@ -90,20 +83,15 @@
.graphite_home{
display: flex;
background: #F6F6F6;
- height: 1840px;
- width: 2800px;
-
}
.heat_area{
width: 1268px;
- height: 1586px;
display: flex;
justify-content: center;
flex-wrap: wrap;
margin: 5px;
gap: 20px;
flex-direction: row;
- padding-top:10px;
padding-bottom: 100px;
background: #FFFFFF;
border-radius: 20px;
@@ -111,17 +99,15 @@
.pickture_area{
width: 1040px;
- height: 1586px;
margin: 5px;
margin-left: 20px;
background: #FFFFFF;
- padding: 50px;
border-radius: 20px;
}
.graphite_btn{
- padding-top: 50px;
- margin-left: 30px;
+ margin-left: 68px;
+ margin-top: 2rem;
}
.btn_size{
@@ -129,10 +115,16 @@
height: 80px;
color: #1989FA;
border: 3px solid #1989FA;
+
+ }
+
+ .open{
+ width: 906px;
}
.graphite_operate{
- gap: 40px;
+ gap: 15px;
+ padding-top:30px;
}
.waste{
From e8e0b9b6365ebe08556b17aae8b855511552b6e0 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Sat, 8 Feb 2025 19:11:32 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=B4=E5=83=8Ficon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/avatar.svg | 1 +
1 file changed, 1 insertion(+)
create mode 100644 src/assets/avatar.svg
diff --git a/src/assets/avatar.svg b/src/assets/avatar.svg
new file mode 100644
index 0000000..ea89d9c
--- /dev/null
+++ b/src/assets/avatar.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
From cfc02ca44b1ebfa0d595924baf3ada6164199f3f Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Mon, 10 Feb 2025 09:08:04 +0800
Subject: [PATCH 3/7] merge master
---
src/assets/arrow.svg | 1 +
src/assets/logo.svg | 2 +-
src/assets/style/mixin.scss | 3 +-
src/views/addLiquid/index.vue | 144 ++++++++++++++++++++++++++++++++++++++-
src/views/components/Header.vue | 117 +++++++++++--------------------
src/views/liquidConfig/index.vue | 2 +-
6 files changed, 186 insertions(+), 83 deletions(-)
create mode 100644 src/assets/arrow.svg
diff --git a/src/assets/arrow.svg b/src/assets/arrow.svg
new file mode 100644
index 0000000..157995c
--- /dev/null
+++ b/src/assets/arrow.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/logo.svg b/src/assets/logo.svg
index 7565660..771b0a2 100644
--- a/src/assets/logo.svg
+++ b/src/assets/logo.svg
@@ -1 +1 @@
-
+
\ No newline at end of file
diff --git a/src/assets/style/mixin.scss b/src/assets/style/mixin.scss
index 83d4fda..9c9fae4 100644
--- a/src/assets/style/mixin.scss
+++ b/src/assets/style/mixin.scss
@@ -1 +1,2 @@
-$textGray: #333;
\ No newline at end of file
+$textGray: #333;
+$addLiquidWidth: 410px;//加液配置 card宽度
\ No newline at end of file
diff --git a/src/views/addLiquid/index.vue b/src/views/addLiquid/index.vue
index f4c3a41..4277e9d 100644
--- a/src/views/addLiquid/index.vue
+++ b/src/views/addLiquid/index.vue
@@ -1,3 +1,143 @@
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/addLiquid/index.vue b/src/views/addLiquid/index.vue
index 4277e9d..85c2f70 100644
--- a/src/views/addLiquid/index.vue
+++ b/src/views/addLiquid/index.vue
@@ -1,9 +1,9 @@
-
+
\ No newline at end of file
From 5dcb8f6a095ab2e60cb0fb9eeb2e758eed48a76f Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Wed, 12 Feb 2025 14:30:53 +0800
Subject: [PATCH 7/7] rebase master
---
src/assets/pwdw_icon.svg | 1 +
src/assets/user_icon.svg | 1 +
src/views/Test.vue | 1 -
src/views/components/Footer.vue | 10 ++--
src/views/login/index.vue | 129 ++++++++++++++++++++++++++++++++++++++--
src/views/login/login.css | 60 -------------------
6 files changed, 131 insertions(+), 71 deletions(-)
create mode 100644 src/assets/pwdw_icon.svg
create mode 100644 src/assets/user_icon.svg
delete mode 100644 src/views/login/login.css
diff --git a/src/assets/pwdw_icon.svg b/src/assets/pwdw_icon.svg
new file mode 100644
index 0000000..64b733d
--- /dev/null
+++ b/src/assets/pwdw_icon.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/user_icon.svg b/src/assets/user_icon.svg
new file mode 100644
index 0000000..222f061
--- /dev/null
+++ b/src/assets/user_icon.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/views/Test.vue b/src/views/Test.vue
index 9426ed6..7229806 100644
--- a/src/views/Test.vue
+++ b/src/views/Test.vue
@@ -26,7 +26,6 @@
const onReturn = () => {
menuId.value = 0
- eventBus.emit("menuId", 0)
router.go(-1)
}
diff --git a/src/views/components/Footer.vue b/src/views/components/Footer.vue
index 2823ef5..0382605 100644
--- a/src/views/components/Footer.vue
+++ b/src/views/components/Footer.vue
@@ -2,7 +2,7 @@
+
溶液配置
-
\ No newline at end of file
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/components/Header.vue b/src/views/components/Header.vue
index 03b723d..68d43cd 100644
--- a/src/views/components/Header.vue
+++ b/src/views/components/Header.vue
@@ -1,111 +1,67 @@
+
+
+
+
+
+ ![]()
+
+ 1 硝酸
+
+
+
+
+
+
+ 300ml
+
+ 300ml
+
+
+
+
+
+
+ ![]()
+
+ 1 硝酸
+
+
+
+
+
+
+ 300ml
+
+ 300ml
+
+
- ![]()
+ ![]()
+
-
- 长春黄金研究院有限公司
+
-
diff --git a/src/components/OverlayModal.vue b/src/components/OverlayModal.vue
new file mode 100644
index 0000000..d8ca6d0
--- /dev/null
+++ b/src/components/OverlayModal.vue
@@ -0,0 +1,59 @@
+
+
{{ currentTime }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 碱中和容器余量低
-
-
-
-
-
-
-
-
-
-
-
-
- 溶液正常
-
-
-
-
- ![]()
+
Admin
+ Admin
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/graphite/components/AddLiquid.vue b/src/views/graphite/components/AddLiquid.vue
new file mode 100644
index 0000000..00c696a
--- /dev/null
+++ b/src/views/graphite/components/AddLiquid.vue
@@ -0,0 +1,173 @@
+
+
- 选择配方
+ 选择工艺
- 执行配方
+ 执行工艺
- 添加溶液
+ 添加溶液
摇匀
@@ -57,25 +57,38 @@
+
\ No newline at end of file
diff --git a/src/views/components/chooseAcidDlg.vue b/src/views/components/chooseAcidDlg.vue
new file mode 100644
index 0000000..cf6b059
--- /dev/null
+++ b/src/views/components/chooseAcidDlg.vue
@@ -0,0 +1,73 @@
+
+
+
-
-
+
@@ -11,60 +11,126 @@
-
- ![]()
1 硝酸
+ {{ index + 1 }} {{ corros.name }}
-
300ml
+ {{ corros.ml }}
- 300ml
-
-
-
+
-
-
- ![]()
-
- 1 硝酸
-
-
-
-
-
- 300ml
-
- 300ml
+ {{ `${corros.ml}/${corros.totalMl}` }}
+
+
+
+
\ No newline at end of file
diff --git a/src/views/graphite/components/AddWaste.vue b/src/views/graphite/components/AddWaste.vue
deleted file mode 100644
index 00c696a..0000000
--- a/src/views/graphite/components/AddWaste.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-
-
+
+ 添加溶液
+
+
+
+
+
+
+
+
+
+
+
+ 300ml
+
+ 硫酸
+
+
+
+
+
+
+
+
+ +
+ ![]()
+
+ ml
+ +
+ 加酸
+
+ 硫酸已添加100ml
+
-
-
-
-
\ No newline at end of file
diff --git a/src/views/graphite/components/CarfList.vue b/src/views/graphite/components/CarfList.vue
new file mode 100644
index 0000000..c99e26f
--- /dev/null
+++ b/src/views/graphite/components/CarfList.vue
@@ -0,0 +1,101 @@
+
+
-
- 添加溶液
-
-
-
-
-
-
-
-
-
-
-
- 300ml
-
- 硫酸
-
-
-
-
-
-
-
-
- -
- ![]()
-
- ml
- -
- 加酸
-
- 硫酸已添加100ml
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/graphite/components/HeatPosition.vue b/src/views/graphite/components/HeatPosition.vue
index 7b7099a..1f52ec3 100644
--- a/src/views/graphite/components/HeatPosition.vue
+++ b/src/views/graphite/components/HeatPosition.vue
@@ -62,8 +62,6 @@
formulaVisible.value = true;
formulaList.value = [{ text: '硫酸', value: '1' }]
formulaList.value.push({ text: '硫酸', value: '1' })
- console.log('----------选择配方-----------')
-
}
const onConfirmFormula = (value:any) => {
diff --git a/src/views/graphite/components/index.ts b/src/views/graphite/components/index.ts
index 6874727..6a67c69 100644
--- a/src/views/graphite/components/index.ts
+++ b/src/views/graphite/components/index.ts
@@ -1,4 +1,4 @@
export {default as HeatPosition} from './HeatPosition.vue'
export {default as TakePickture} from './TakePickture.vue'
-export { default as AddWaste} from './AddWaste.vue'
+export { default as AddLiquid} from './AddLiquid.vue'
diff --git a/src/views/graphite/index.vue b/src/views/graphite/index.vue
index b2e4279..0222997 100644
--- a/src/views/graphite/index.vue
+++ b/src/views/graphite/index.vue
@@ -21,15 +21,15 @@
选择工艺
+
+
+
+ 工艺名称
+
+
+ {{ item.name }}
+
-
+
-
+
+
+
@@ -51,8 +51,8 @@ const showWastePopover = ref(false)
align-items: center;
border-radius: 5px;
background: #FFFFFF;
- height: 1.25rem;
- width: 39.625rem;
+ height: 2.5rem;
+ width: 41rem;
margin-left: 11.875rem;
}
.footer_waste{
@@ -62,7 +62,7 @@ const showWastePopover = ref(false)
width: 13.4375rem;
height: 2.5rem;
background: #FFFFFF;
- margin-left: 10px;
+ margin-left: 1.5rem;
}
.footer_normal{
@@ -71,7 +71,7 @@ const showWastePopover = ref(false)
.text_size{
font-size:1rem;
- padding-right: 5px;
+ padding-right: .3125rem;
}
.footer_container{
display: flex;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 99e910b..711d9ca 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -4,18 +4,26 @@
-
@@ -24,7 +32,9 @@ import { ref } from "vue";
import { useRouter } from "vue-router";
import { showToast } from "vant";
import { login } from "@/services/user/userManager";
-
+import logoSvg from '@/assets/logo.svg'
+import userIconSvg from '@/assets/user_icon.svg'
+import pwdIconSvg from '@/assets/pwdw_icon.svg'
const router = useRouter();
// 定义用户名和密码的响应式变量
const username = ref("");
@@ -32,6 +42,10 @@ const password = ref("");
// 处理登录的函数
const handleLogin = async () => {
+ if(!username.value || !password.value){
+ showToast('请输入用户名或密码！');
+ return;
+ }
const res = await login({ username: username.value, password: password.value });
if (res.success) {
sessionStorage.setItem("token", res.data);
@@ -42,6 +56,111 @@ const handleLogin = async () => {
};
-
diff --git a/src/views/login/login.css b/src/views/login/login.css
deleted file mode 100644
index fd88598..0000000
--- a/src/views/login/login.css
+++ /dev/null
@@ -1,60 +0,0 @@
-.login-container {
- position: relative;
- width: 100vw;
- height: 100vh;
- overflow: hidden;
- }
-
- .background-image {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background-image: url('https://via.placeholder.com/1920x1080'); /* 替换为你自己的背景图 URL */
- background-size: cover;
- background-position: center;
- filter: blur(5px);
- z-index: -1;
- }
-
- .login-form {
- position: absolute;
- top: 50%;
- left: 50%;
- height: 600px;
- transform: translate(-50%, -50%);
- background-color: rgba(255, 255, 255, 0.8);
- padding: 20px;
- border-radius: 10px;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
- text-align: center;
- }
-
- .input-field {
- width: 100%;
- padding: 10px;
- margin: 10px 0;
- border: 1px solid #ccc;
- border-radius: 5px;
- }
-
- .login-button {
- width: 100%;
- padding: 10px;
- background-color: #007bff;
- color: white;
- border: none;
- border-radius: 5px;
- cursor: pointer;
- margin-top: 35%;
- }
-
- .login-button:hover {
- background-color: #0056b3;
- }
-
- .login-user-input{
- width: 400px;
- margin-top: 15%;
- }
\ No newline at end of file
登录
+
+ ![]()
+
长春黄金研究院有限公司
+
+ ![]()
- 用户名
+
+
+
+ ![]()
密码
+