From cf49fa32aad9c0089a3b48c4d0445528fb5cc445 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 30 九月 2024 12:55:52 +0800
Subject: [PATCH] Merge branch 'master' into release
---
src/views/console/system/addUser.vue | 4 ++--
src/views/console/soam/oss-system.vue | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/console/soam/oss-system.vue b/src/views/console/soam/oss-system.vue
index 05bd445..deb4a79 100644
--- a/src/views/console/soam/oss-system.vue
+++ b/src/views/console/soam/oss-system.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-09-26 14:53:45
+ * @LastEditTime: 2024-09-30 10:10:59
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -36,7 +36,7 @@
</el-row>
</el-form>
</el-tab-pane>
- <el-tab-pane label="浼佷笟LOGO">
+ <!-- <el-tab-pane label="浼佷笟LOGO">
<div class="tabTitle">浼佷笟LOGO</div>
<span class="logotitle">涓婁紶logo</span>
<div class="logo1">
@@ -128,7 +128,7 @@
</el-form-item>
</el-form>
</el-card>
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="鎺堟潈">
<div class="tabTitle">鎺堟潈</div>
<div class="license-detail">
@@ -139,7 +139,7 @@
<div><span class="left">璁惧鏍囪瘑锛�</span><span class="licenseCopy" @click="licenseCopy">澶嶅埗</span></div>
</div>
</el-tab-pane>
- <el-tab-pane label="鏈嶅姟闆嗘垚">
+ <!-- <el-tab-pane label="鏈嶅姟闆嗘垚">
<div class="tabTitle">鏈嶅姟闆嗘垚</div>
<div class="card">
<div class="top">
@@ -193,8 +193,8 @@
</div>
</div>
</div>
- </el-tab-pane>
- <el-tab-pane label="DMP鏃ュ織">
+ </el-tab-pane> -->
+ <!-- <el-tab-pane label="DMP鏃ュ織">
<div class="tabTitle">DMP鏃ュ織</div>
<el-form :inline="true" :model="DMPsearchData" label-width="80px">
<el-row>
@@ -236,7 +236,7 @@
<el-table-column prop="test" label="绫诲瀷"></el-table-column>
<el-table-column fixed="right" label="鎿嶄綔">
<template #default="scope">
- <!-- <el-button text type="primary" size="small" @click="showDrawer(scope.row, scope.$index)">锛燂紵</el-button> -->
+ <el-button text type="primary" size="small" @click="showDrawer(scope.row, scope.$index)">锛燂紵</el-button>
</template>
</el-table-column>
</el-table>
@@ -251,7 +251,7 @@
layout="total, sizes, prev, pager, next, jumper"
:total="DMPsearchData.total">
</el-pagination>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="addOssSuccess" @closed="dialog.save=false"></save-dialog>
<!-- 瑙ｇ粦 -->
diff --git a/src/views/console/system/addUser.vue b/src/views/console/system/addUser.vue
index c7d4166..f9ce99f 100644
--- a/src/views/console/system/addUser.vue
+++ b/src/views/console/system/addUser.vue
@@ -14,7 +14,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="瀵嗙爜">
- <el-input v-model="form.test" placeholder="" :disabled="isDisabled" clearable></el-input>
+ <el-input v-model="form.password" placeholder="" :disabled="isDisabled" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -74,7 +74,7 @@
isSaveing: false,
//琛ㄥ崟鏁版嵁
form: {
- test: "",
+ password: "",
account: "",
realName: "",
phone: "",
--
Gitblit v1.9.3