From edf269391cc909449867ee3ec48699e9f73b60a7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 19 九月 2023 16:24:13 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS-WEB/src/page/login/index.vue | 12 ++++++------
Source/UBCS-WEB/src/page/login/userlogin.vue | 12 ++++++++----
Source/UBCS-WEB/src/views/integration/systemInfo.vue | 29 +++++++++++------------------
3 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/Source/UBCS-WEB/src/page/login/index.vue b/Source/UBCS-WEB/src/page/login/index.vue
index 0e0b68e..1ec9a95 100644
--- a/Source/UBCS-WEB/src/page/login/index.vue
+++ b/Source/UBCS-WEB/src/page/login/index.vue
@@ -21,12 +21,12 @@
</h4>
<userLogin v-if="activeName==='user'"></userLogin>
<thirdLogin v-else-if="activeName==='third'"></thirdLogin>
- <div class="login-menu">
- <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a>
- <!--<a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>-->
- <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>
- <a :href="website.ssoUrl + website.redirectUri">{{ $t('login.ssoLogin') }}</a>
- </div>
+<!-- <div class="login-menu">-->
+<!-- <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a>-->
+<!-- <a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>-->
+<!-- <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>-->
+<!-- <a :href="website.ssoUrl + website.redirectUri">{{ $t('login.ssoLogin') }}</a>-->
+<!-- </div>-->
</div>
</div>
diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index b08bc18..a8877c8 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -8,7 +8,7 @@
status-icon
>
<el-form-item prop="selectInput">
- <el-select v-model="loginForm.tenantId" placeholder="璇烽�夋嫨绉熸埛" style="width: 100%" @change="selectchange">
+ <el-select v-model="loginForm.tenantId" placeholder="璇烽�夋嫨绉熸埛" style="width: 100%" @change="selectChange">
<i slot="prefix" class="el-icon-s-operation"/>
<el-option
v-for="(item,index) in loginForm.region"
@@ -40,6 +40,7 @@
</el-form-item>
<el-form-item>
+ <el-button @click="ChandleLogin">娴嬭瘯鍗曠偣鐧诲綍</el-button>
<el-button class="login-submit"
size="small"
type="primary"
@@ -62,7 +63,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="delok">鍙� 娑�</el-button>
- <el-button type="primary" @click="addok">纭� 瀹�</el-button>
+ <el-button type="primary" @click="addHandler">纭� 瀹�</el-button>
</div>
</el-dialog>
</div>
@@ -192,6 +193,9 @@
},
props: [],
methods: {
+ ChandleLogin(){
+
+ },
closehandle(){
removeToken()
},
@@ -201,7 +205,7 @@
removeToken()
},
// 鐐瑰嚮纭畾淇敼瀵嗙爜
- addok(){
+ addHandler(){
this.dialogFormVisible = false
updatePassword(md5(this.form.oldPassword), this.form.newPassword, this.form.newPassword1).then(res=>{
console.log(res)
@@ -215,7 +219,7 @@
})
},
// 缁戝畾涓嬫媺鑿滃崟鍔ㄦ�両D
- selectchange(value) {
+ selectChange(value) {
this.loginForm.tenantId = value
},
showPassword() {
diff --git a/Source/UBCS-WEB/src/views/integration/systemInfo.vue b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
index 392d645..2efc562 100644
--- a/Source/UBCS-WEB/src/views/integration/systemInfo.vue
+++ b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
@@ -19,7 +19,13 @@
:size="size" clearable style="width:300px;margin-left: 10px;"
@clear="handleClear" @keyup.enter.native="handleEnter"></el-input>
</template>
+ <template #menu="{row,index,size}">
+ <el-button type="text" icon="el-icon-menu" size="small" @click="classifyHandler">鍒嗙被鎺堟潈</el-button>
+
+ </template>
</avue-crud>
+ <el-dialog :visible.sync="dialogVisible" append-to-body title="鍒嗙被鎺堟潈">
+ </el-dialog>
</basic-container>
</template>
<script>
@@ -29,6 +35,7 @@
data() {
return {
loading: false,
+ dialogVisible:false,
page: {
currentPage: 1,
pageSize: 10,
@@ -93,24 +100,10 @@
}
},
methods: {
- // 鑾峰彇鍒楄〃
- // async getDataList() {
- // this.loading = true
- // console.log(this.search)
- // const { pageSize, currentPage } = this.page
- // let param = { size: pageSize, current: currentPage }
- // this.search = Object.keys(this.search)
- // .filter((key) => this.search[key] !== null && this.search[key] !== undefined && this.search[key] !== "")
- // .reduce((acc, key) => ({ ...acc, [key]: this.search[key] }), {});
- // const response = await getSysInfoList(pageSize,currentPage,{...param})
- // if (response.status === 200) {
- // console.log(response)
- // this.loading = false
- // const data = response.data.data
- // this.data = data.records
- // this.page.total = data.total
- // } else this.loading = false
- // },
+ //鍒嗙被鎺堟潈
+ classifyHandler(){
+ this.dialogVisible=true;
+ },
async getDataList() {
this.loading = true;
console.log(this.search);
--
Gitblit v1.9.3