Skip to content

D
dsk-cr20g
Commit 4c6734c2 authored by huangjie's avatar huangjie
Browse files
Options

*

parent 9b7bf9a1
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 6 deletions
dsk-operate-ui/public/index.html
View file @ 4c6734c2
...@@ -118,7 +118,8 @@ ...@@ -118,7 +118,8 @@
top: 0; top: 0;
width: 51%; width: 51%;
height: 100%; height: 100%;
background: #7171C6; /*background: #7171C6;*/
background: #46A5FF;
z-index: 1000; z-index: 1000;
-webkit-transform: translateX(0); -webkit-transform: translateX(0);
-ms-transform: translateX(0); -ms-transform: translateX(0);
...@@ -197,12 +198,12 @@ ...@@ -197,12 +198,12 @@
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<!-- <div id="loader-wrapper"> <div id="loader-wrapper">
<div id="loader"></div> <div id="loader"></div>
<div class="loader-section section-left"></div> <div class="loader-section section-left"></div>
<div class="loader-section section-right"></div> <div class="loader-section section-right"></div>
<div class="load_title">正在加载系统资源，请耐心等待</div> <div class="load_title">正在加载央企数字化经营管理系统</div>
</div>--> </div>
</div> </div>
</body> </body>
</html> </html>
dsk-operate-ui/src/layout/components/TagsView/index.vue
View file @ 4c6734c2
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<img src="@/assets/images/all_on.png" v-if="showall"/> <img src="@/assets/images/all_on.png" v-if="showall"/>
<!--<i class="el-icon-arrow-down" v-if="!showall"></i> <i class="el-icon-arrow-up" v-if="showall"></i>--> <!--<i class="el-icon-arrow-down" v-if="!showall"></i> <i class="el-icon-arrow-up" v-if="showall"></i>-->
</div> </div>
<el-collapse-transition>
<div class="tagslist" v-if="showall"> <div class="tagslist" v-if="showall">
<draggable v-model="visitedViews" :options="dragOptions" @end="end"> <draggable v-model="visitedViews" :options="dragOptions" @end="end">
<router-link <router-link
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
</draggable> </draggable>
</div> </div>
</el-collapse-transition>
</div> </div>
<scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll"> <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
<draggable v-model="visitedViews" :options="dragOptions" @end="end"> <draggable v-model="visitedViews" :options="dragOptions" @end="end">
......
dsk-operate-ui/src/views/system/user/index.vue
View file @ 4c6734c2
...@@ -399,6 +399,7 @@ ...@@ -399,6 +399,7 @@
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"; import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { getToken ,getTenantid} from "@/utils/auth"; import { getToken ,getTenantid} from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import {Base64} from 'js-base64'
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
...@@ -653,8 +654,9 @@ export default { ...@@ -653,8 +654,9 @@ export default {
inputPattern: /^.{5,20}$/, inputPattern: /^.{5,20}$/,
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间" inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
}).then(({ value }) => { }).then(({ value }) => {
resetUserPwd(row.userId, value).then(response => { resetUserPwd(row.userId, Base64.encode(value)).then(response => {
this.$modal.msgSuccess("修改成功，新密码是：" + value); // this.$modal.msgSuccess("修改成功，新密码是：" + value);
this.$modal.msgSuccess("修改成功！");
}); });
}).catch(() => {}); }).catch(() => {});
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment