|
@@ -24,9 +24,6 @@
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <UpdatePassword :innerVisible="innerVisible" v-on:innerDialog="getInnerStatus($event)"></UpdatePassword>
|
|
|
-
|
|
|
-<!-- <UpdatePassword ref="updatePassword"></UpdatePassword>-->
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
@@ -37,7 +34,6 @@ import PopularContent from "./components/popular-content.vue";
|
|
|
import CateforiesPercent from "./components/categories-percent.vue";
|
|
|
import RecentlyVisited from "./components/recently-visited.vue";
|
|
|
import QuickOperation from "./components/quick-operation.vue";
|
|
|
-import UpdatePassword from "@/views/layout/UpdatePassword2.vue";
|
|
|
|
|
|
// import TodoList from './components/todoList.vue'
|
|
|
import Announcement from "./components/announcement.vue";
|
|
@@ -47,7 +43,6 @@ import Carousel from "./components/carousel.vue";
|
|
|
import Docs from "./components/docs.vue";
|
|
|
import Wx from "./components/wx.vue";
|
|
|
import Footer from "@/components/footer/index.vue";
|
|
|
-import userService from "@/api/sys/UserService";
|
|
|
export default {
|
|
|
name: "Dashboard", // If you want the include property of keep-alive to take effect, you must name the component
|
|
|
data(){
|
|
@@ -70,28 +65,10 @@ export default {
|
|
|
Docs,
|
|
|
Wx,
|
|
|
Footer,
|
|
|
- UpdatePassword,
|
|
|
- // updatePassword
|
|
|
+
|
|
|
},
|
|
|
activated() {
|
|
|
- userService.is().then((data) => {
|
|
|
- console.log('是否为管理员', data)
|
|
|
- // this.$router.replace({
|
|
|
- // path:"/UpdataPassword.vue"
|
|
|
- // })
|
|
|
- if (!data) {
|
|
|
- // 如果当前用户不是管理员,则判断是否修改过密码
|
|
|
- userService.isUpdatePassword().then((data) => {
|
|
|
- console.log('是否修改过密码', data)
|
|
|
- if (!data){
|
|
|
- // 如果没有修改过密码,则弹出密码修改窗口
|
|
|
- this.innerVisible = true
|
|
|
- // this.$refs.updatePassword.init(true);
|
|
|
- // console.log(this.$refs.updatePassword,11111111111111111111111111)
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
- })
|
|
|
+
|
|
|
},
|
|
|
methods:{
|
|
|
getInnerStatus(status){
|