From 489085c3a86ba2a93ea58c59b2620d2ac9a063a6 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 18 Jul 2024 09:56:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA=E7=AD=89?=
=?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sgzb-ui/src/views/newLogin.vue | 1510 +++++++++--------
sgzb-ui/src/views/stquery/backRecord.vue | 2 -
.../src/views/stquery/deviceStatusRecord.vue | 2 +-
sgzb-ui/src/views/stquery/leaseRecord.vue | 2 -
sgzb-ui/vue.config.js | 4 +-
5 files changed, 828 insertions(+), 692 deletions(-)
diff --git a/sgzb-ui/src/views/newLogin.vue b/sgzb-ui/src/views/newLogin.vue
index 0b307040..46fca021 100644
--- a/sgzb-ui/src/views/newLogin.vue
+++ b/sgzb-ui/src/views/newLogin.vue
@@ -1,230 +1,341 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
diff --git a/sgzb-ui/src/views/stquery/backRecord.vue b/sgzb-ui/src/views/stquery/backRecord.vue
index 44c02f6a..fb9464c6 100644
--- a/sgzb-ui/src/views/stquery/backRecord.vue
+++ b/sgzb-ui/src/views/stquery/backRecord.vue
@@ -23,7 +23,6 @@
@@ -39,7 +38,6 @@
diff --git a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
index 215d870a..e7eaa000 100644
--- a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
+++ b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue
@@ -331,7 +331,7 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.download(
- 'material/backRecord/export',
+ 'material/storageStatus/export',
{
...this.queryParams,
},
diff --git a/sgzb-ui/src/views/stquery/leaseRecord.vue b/sgzb-ui/src/views/stquery/leaseRecord.vue
index 4abe4920..03f79796 100644
--- a/sgzb-ui/src/views/stquery/leaseRecord.vue
+++ b/sgzb-ui/src/views/stquery/leaseRecord.vue
@@ -23,7 +23,6 @@
@@ -39,7 +38,6 @@
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index afc476aa..cb6a1ad5 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -44,8 +44,8 @@ module.exports = {
// target: `http://192.168.2.76:28080`, //超
// target: `http://10.40.92.81:8080`, //韩/
- target: `http://192.168.2.76:28080`,//旭/
- //target: `http://192.168.2.248:28080`, //帅
+ // target: `http://192.168.2.76:28080`,//旭/
+ target: `http://192.168.2.248:28080`, //帅
// target: `http://10.40.92.253:28080`, //福
//******** 注意事项 ********* */