bluejay
2025-04-14 ce60acb9450489d62f9c4f4fa874c10975fe65cc
Merge remote-tracking branch 'origin/dev' into dev
已修改3个文件
10 ■■■■ 文件已修改
src/views/basicData/ApsResourceGroup/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/processRoute/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/login.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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">
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>
src/views/login.vue
@@ -77,8 +77,8 @@
const { proxy } = getCurrentInstance();
const loginForm = ref({
  username: "admin",
  password: "admin123",
  username: "",
  password: "",
  rememberMe: false,
  code: "",
  uuid: ""