From ce60acb9450489d62f9c4f4fa874c10975fe65cc Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期一, 14 四月 2025 11:40:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/login.vue | 4 ++--
src/views/basicData/ApsResourceGroup/index.vue | 2 +-
src/views/basicData/processRoute/index.vue | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/basicData/ApsResourceGroup/index.vue b/src/views/basicData/ApsResourceGroup/index.vue
index bf9d6be..29c423e 100644
--- a/src/views/basicData/ApsResourceGroup/index.vue
+++ b/src/views/basicData/ApsResourceGroup/index.vue
@@ -44,7 +44,7 @@
plain
icon="Upload"
@click="handleImport"
- v-hasPermi="['ApsResourceGroup:ApsResourceGroup:import']"
+ v-hasPermi="['ApsResourceGroup:ApsResourceGroup:importData']"
>瀵煎叆</el-button>
</el-col>
<el-col :span="1.5">
diff --git a/src/views/basicData/processRoute/index.vue b/src/views/basicData/processRoute/index.vue
index 94e9578..204dc6f 100644
--- a/src/views/basicData/processRoute/index.vue
+++ b/src/views/basicData/processRoute/index.vue
@@ -44,7 +44,7 @@
plain
icon="Upload"
@click="handleImport"
- v-hasPermi="['processRoute:processRoute:import']"
+ v-hasPermi="['processRoute:processRoute:importData']"
>瀵煎叆</el-button>
</el-col>
<el-col :span="1.5">
@@ -104,7 +104,7 @@
icon="Check"
:disabled="planned"
@click="uploadParse"
- v-hasPermi="['partPlan:edit']"
+ v-hasPermi="['processRoute:processRoute:confirmProcessRoute']"
>涓婁紶骞惰В鏋�</el-button>
</div>
</el-col>
diff --git a/src/views/login.vue b/src/views/login.vue
index b446dfd..a8a101f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -77,8 +77,8 @@
const { proxy } = getCurrentInstance();
const loginForm = ref({
- username: "admin",
- password: "admin123",
+ username: "",
+ password: "",
rememberMe: false,
code: "",
uuid: ""
--
Gitblit v1.9.3