From 716ded9c48898ff8fb9e4a1872ccfe676c7f2f99 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 15 四月 2023 16:32:28 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS-WEB/src/views/wel/index.vue | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 107 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index b076aab..2bd49ae 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -216,7 +216,7 @@
<div>9.[鍗囩骇]Oss涓嶴ms鍗囩骇渚濊禆骞堕�傞厤鏈�鏂扮増</div>
<div>10.[鏂板]鍩轰簬瀹濆绯荤粺鐨勯儴缃叉柟妗�</div>
<div>11.[鏂板]Prometheus鍏ㄦ柟浣嶇洃鎺ф柟妗�</div>
- <div>12.[鏂板]blade-admin鏈嶅姟鏀寔prometheus瀵筺acos鐨勬湇鍔″彂鐜�</div>
+ <div>12.[鏂板]ubcs-admin鏈嶅姟鏀寔prometheus瀵筺acos鐨勬湇鍔″彂鐜�</div>
<div>13.[鏂板]BladeX瀵规帴Prometheus閮ㄧ讲鑴氭湰</div>
<div>14.[鏂板]Saber杩滅▼閮ㄧ讲鎺ㄩ�佽剼鏈�</div>
<div>15.[鏂板]鍩轰簬Sentinel鐨勬湇鍔＄啍鏂柟妗�</div>
@@ -225,7 +225,7 @@
<div>18.[浼樺寲]灏唖ms-starter绯诲垪鍚堝苟涓轰竴</div>
<div>19.[浼樺寲]澧炲己浼樺寲Url閫氶厤绗﹀尮閰嶉�昏緫</div>
<div>20.[浼樺寲]鏁版嵁鏉冮檺缂撳瓨閫昏緫</div>
- <div>21.[浼樺寲]blade-auto灏佽</div>
+ <div>21.[浼樺寲]ubcs-auto灏佽</div>
<div>22.[浼樺寲]SqlLogInterceptor閰嶇疆</div>
</el-collapse-item>
<el-collapse-item title="2.7.2.RELEASE鍙戝竷锛岄噸鏋勫崌绾у父鐢ㄥ姛鑳斤紝浼樺寲浣跨敤浣撻獙" name="21">
@@ -272,8 +272,8 @@
<div>12.[鏂板]鐢ㄦ埛瀵煎叆瀵煎嚭鐨勭敤鎴峰钩鍙板瓧娈�</div>
<div>13.[淇敼]鏃ュ織璺緞榛樿浼樺厛绾э紝鏀寔閰嶇疆瑕嗙洊</div>
<div>14.[淇敼]Report妯″潡鍖呰矾寰勶紝鏂板Core鐩綍</div>
- <div>15.[閲嶆瀯]blade-admin锛岄拤閽夌洃鎺ч�氱煡瀹炵幇</div>
- <div>16.[浼樺寲]blade-admin锛屽鍔犺处鍙峰瘑鐮佺櫥褰�</div>
+ <div>15.[閲嶆瀯]ubcs-admin锛岄拤閽夌洃鎺ч�氱煡瀹炵幇</div>
+ <div>16.[浼樺寲]ubcs-admin锛屽鍔犺处鍙峰瘑鐮佺櫥褰�</div>
<div>17.[浼樺寲]RefreshToken鍒锋柊閫昏緫</div>
<div>18.[浼樺寲]绉熸埛鏂板閫昏緫锛屼笟鍔″瓧鍏告敮鎸佹棤闄愬眰绾у鍒�</div>
<div>19.[浼樺寲]Ribbon缁勪欢锛屾敮鎸丗eign璋冪敤閰嶇疆</div>
@@ -517,7 +517,7 @@
<div>18.[淇]docker鑴氭湰nginx绔彛鍖归厤闂</div>
<div>19.[淇]鏈烘瀯妯″潡鎻愪氦鏈垹闄ょ紦瀛樼殑闂</div>
<div>20.[淇]oss缂撳瓨鑾峰彇鏈姞绉熸埛鍒ゆ柇鐨勯棶棰�</div>
- <div>21.[淇]blade-auth鍦╦ava11涓嬫棤娉曡繍琛岀殑闂</div>
+ <div>21.[淇]ubcs-auth鍦╦ava11涓嬫棤娉曡繍琛岀殑闂</div>
</el-collapse-item>
<el-collapse-item title="2.2.1.RELEASE鍙戝竷锛岄泦鎴怑LK锛屽鍔犲垎甯冨紡鏃ュ織杩借釜" name="10">
<div>1.[鏂板]闆嗘垚鏈�鏂扮増ELK锛屽鍔犲垎甯冨紡鏃ュ織杩借釜鍔熻兘</div>
@@ -542,7 +542,7 @@
<div>8.[鏂板]saber鏀寔tab鍒囨崲淇濆瓨椤甸潰鐘舵��</div>
<div>9.[鏂板]娣诲姞bom缁熶竴鐗堟湰閰嶇疆</div>
<div>10.[鏂板]娣诲姞trace starter</div>
- <div>11.[鏂板]blade-admin鎺掗櫎seata鏈嶅姟</div>
+ <div>11.[鏂板]ubcs-admin鎺掗櫎seata鏈嶅姟</div>
<div>12.[鏂板]oss鏁忔劅鎿嶄綔澧炲姞鏉冮檺鏍￠獙</div>
<div>13.[鏂板][淇]dict銆乺ole涓嶉�夋嫨鐖惰妭鐐规姤閿�</div>
<div>14.[鏂板]鍔ㄦ�佺綉鍏宠缃惎鍔ㄥ姞杞�</div>
@@ -551,7 +551,7 @@
<el-collapse-item title="2.1.0.RELEASE鍙戝竷锛屽叏闈㈠寮哄簳灞傞┍鍔�" name="8">
<div>1.[鍗囩骇]springboot 2.1.8銆乻pringcloud greenwich sr3</div>
<div>2.[鏂板]闆嗘垚seata锛屾彁渚涙渶绠�闆嗘垚鏂规</div>
- <div>3.[鏂板]blade-admin澧炲姞nacos鍔ㄦ�佺洃鍚�</div>
+ <div>3.[鏂板]ubcs-admin澧炲姞nacos鍔ㄦ�佺洃鍚�</div>
<div>4.[鏂板]澧炲姞alioss闆嗘垚锛屽己鍖杘ss杩斿洖淇℃伅</div>
<div>5.[鏂板]鑾峰彇浠ょ墝鎿嶄綔澧炲姞绌哄垽鏂�</div>
<div>6.[鏂板]鎷嗗垎鏁版嵁搴撲緷璧栥�佸寮簃ybatis銆佸鍔爕ml鑷畾涔夐厤缃鍙�</div>
@@ -624,7 +624,7 @@
<div>2.[鏂板]澧炲姞qiniu灏佽</div>
<div>3.[鏂板]澧炲姞oss缁熶竴鎺ュ彛</div>
<div>4.[鏂板]闆嗘垚minio銆乹iniu锛岃繘琛岀粺涓�绠＄悊鐨勫绉熸埛oss绯荤粺</div>
- <div>5.[浼樺寲]blade-core-cloud閫昏緫</div>
+ <div>5.[浼樺寲]ubcs-core-cloud閫昏緫</div>
<div>6.[鏂板]badex-biz澧炲姞涓嶅悓鍖呭悕鐨剆wagger銆乵ybatis閰嶇疆demo</div>
<div>7.[鏂板]badex-biz澧炲姞nacos鑷畾涔夋敞鍐屾枃浠禿emo</div>
<div>8.[鏂板]bladex-biz澧炲姞nacos鍙傛暟鍔ㄦ�佸埛鏂癲emo</div>
@@ -664,11 +664,32 @@
</el-col>
</el-row>
+ <el-dialog title="淇敼瀵嗙爜" :visible.sync="dialogFormVisible" append-to-body :close-on-press-escape="false" :before-close="Xdelhandle">
+ <el-form :model="form" :rules="rules" ref="form">
+ <el-form-item label="鍘熷瘑鐮�" :label-width="formLabelWidth" prop="oldPassword">
+ <el-input v-model="form.oldPassword" autocomplete="off"></el-input>
+ </el-form-item>
+ <el-form-item label="鏂板瘑鐮�" :label-width="formLabelWidth" prop="newPassword">
+ <el-input v-model="form.newPassword" autocomplete="off"></el-input>
+ </el-form-item>
+ <el-form-item label="纭瀵嗙爜" :label-width="formLabelWidth" prop="newPassword1">
+ <el-input v-model="form.newPassword1" autocomplete="off"></el-input>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="delhandle">鍙� 娑�</el-button>
+ <el-button type="primary" @click="addok">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
</div>
</template>
<script>
import {mapGetters} from "vuex";
+ import {check} from "@/api/system/user"
+ import {updatePassword} from "@/api/system/user.js"
+ import md5 from "js-md5";
+ import {removeToken} from "@/util/auth";
export default {
name: "wel",
@@ -676,12 +697,33 @@
return {
activeNames: ['1', '2', '3', '5'],
logActiveNames: ['28'],
- aaa:[]
+ userarr:[],
+ userid:'',
+ updataArr:[],
+ dialogFormVisible:false,
+ form: {
+ oldPassword: '',
+ newPassword: '',
+ newPassword1: '',
+ },
+ rules: {
+ oldPassword: [
+ { required: true, message: '璇疯緭鍏ュ師瀵嗙爜', trigger: 'blur' }
+ ],
+ newPassword:[
+ { required: true, message: '璇疯緭鍏ユ柊瀵嗙爜', trigger: 'blur' }
+ ],
+ newPassword1:[
+ { required: true, message: '璇疯緭纭瀵嗙爜', trigger: 'blur' }
+ ]
+ },
};
},
+ // 鎷垮埌userid璇锋眰鎺ュ彛
created() {
- this.aaa=this.$store.state.upadatastatus
- console.log(this.aaa)
+ this.updataArr=JSON.parse(localStorage.getItem("updataid"))
+ this.userid=this.$store.state.user.upadatastatus.user_id
+ this.checkhandle()
},
computed: {
...mapGetters(["userInfo"]),
@@ -689,6 +731,60 @@
methods: {
handleChange(val) {
window.console.log(val);
+ },
+ //element缁勪欢鍏抽棴寮圭獥鐨勫欢杩熷洖璋冿紝杩欓噷娌℃湁鐢ㄥ叧闂脊绐楃殑鏂规硶锛屽洜涓哄綋鐢ㄦ埛鐐瑰嚮纭涔熸槸鍏抽棴寮圭獥锛屽鏋滅櫥褰曟垚鍔熷脊绐楀叧闂悗涔熸槸浼氭竻闄oken鍥炲埌鐧诲綍椤�
+ //Xdelhandle鏄偣鍑籜鍙峰叧闂脊鍞�,delhandle鏄偣鍑诲彇娑堝叧闂脊绐�,鍦ㄨ繖鍒嗕簡涓や釜浜嬩欢
+ Xdelhandle(){
+ removeToken()
+ this.dialogFormVisible = false
+ },
+ // 鍏抽棴寮圭獥鍚庢竻闄oken杩斿洖鍒扮櫥褰曢〉闈�
+ delhandle(){
+ removeToken()
+ this.dialogFormVisible = false
+ },
+ // 淇敼瀵嗙爜鏂规硶
+ addok(){
+ this.dialogFormVisible = false
+ updatePassword(md5(this.form.oldPassword), this.form.newPassword, this.form.newPassword1).then(res=>{
+ if(res.data.code==200){
+ this.$message({
+ type:"success",
+ message:"淇敼鎴愬姛锛�"
+ })
+ }
+ }).catch(res=>{
+ console.log(res)
+ this.checkhandle()
+ })
+ },
+ // 鎻愰啋鏃堕棿璇锋眰锛屼篃闇�瑕佸垽鏂槸鍚︿负瓒呯韬唤锛岃秴绠¤韩浠戒笉鍒ゆ柇
+ checkhandle(){
+ if(this.updataArr.user_id != '0' && this.updataArr.tenant_id !== '000000'){
+ check(this.userid).then(res=>{
+ if(res.data.data>0){
+ this.$message({
+ type:'warning',
+ message:`浣犺繕鏈�${res.data.data}澶╁氨瑕佷慨鏀瑰瘑鐮佷簡`
+ })
+ }else if(res.data.data == -1){
+ this.$message({
+ type: "warning",
+ message: "瀵嗙爜绛栫暐宸茶淇敼锛岃閲嶆柊淇敼瀵嗙爜锛�"
+ })
+ setTimeout(()=>{
+ this.dialogFormVisible=true
+ },1500)
+ }else if(res.data.data == 0){
+ this.$message({
+ type:'success',
+ message:"鎿嶄綔鎴愬姛"
+ })
+ }
+ }).catch(res=>{
+ console.log(res)
+ })
+ }
}
},
};
--
Gitblit v1.9.3