shuishen
2022-12-28 8a18a1148065fa1f28c4a8479c825051901547ba
noun change
4 files modified
1 files renamed
62 ■■■■ changed files
src/components/map/index.vue 6 ●●●● patch | view | raw | blame | history
src/router/page/index.js 10 ●●●● patch | view | raw | blame | history
src/views/home/index.vue 4 ●●●● patch | view | raw | blame | history
src/views/layout/index.vue 20 ●●●● patch | view | raw | blame | history
src/views/login/index.vue 22 ●●●● patch | view | raw | blame | history
src/components/map/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 17:00:30
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-12-28 10:19:11
 * @LastEditTime: 2022-12-28 10:24:21
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -384,8 +384,8 @@
    methods: {
        // 模型的点击事件
        tilesetClick (e) {
            if (this.$route.path != "/lyout/house") {
                this.$router.push({ path: '/lyout/house', query: { searchName: 'xxx小区' } })
            if (this.$route.path != "/layout/house") {
                this.$router.push({ path: '/layout/house', query: { searchName: 'xxx小区' } })
            }
        },
        switchImg () {
src/router/page/index.js
@@ -9,7 +9,7 @@
import VueRouter from 'vue-router'
Vue.use(VueRouter)
const lyout = () => import('../../views/lyout/index.vue')
const layout = () => import('../../views/layout/index.vue')
const home = () => import('../../views/home/index.vue')
const house = () => import('../../views/house/index.vue')
const police = () => import('../../views/police/index.vue')
@@ -31,15 +31,15 @@
    },
    {
        path: '/',
        redirect: '/lyout'
        redirect: '/layout'
    },
    {
        path: '/lyout',
        redirect: '/lyout/home',
        path: '/layout',
        redirect: '/layout/home',
        meta: {
            title: '导航菜单'
        },
        component: lyout,
        component: layout,
        children: [
            {
                path: 'home',
src/views/home/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-12-28 10:02:27
 * @LastEditTime: 2022-12-28 10:26:55
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -702,7 +702,7 @@
        },
        houseSiteClick (e) {
            this.$router.push({ path: '/lyout/house', query: { searchName: 'xxx小区' } })
            this.$router.push({ path: '/layout/house', query: { searchName: 'xxx小区' } })
        },
        carChange (e) {
src/views/layout/index.vue
File was renamed from src/views/lyout/index.vue
@@ -3,7 +3,7 @@
 * @Date: 2022-08-18 16:18:24
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-12-28 10:08:37
 * @FilePath: \srs-police-affairs\src\views\lyout\index.vue
 * @FilePath: \srs-police-affairs\src\views\layout\index.vue
 * @Description: 
 * 
 * Copyright (c) 2022 by shuishen 1109946754@qq.com, All Rights Reserved. 
@@ -96,37 +96,37 @@
            menuLeftList: [
                {
                    menuName: '首页',
                    path: '/lyout/home'
                    path: '/layout/home'
                },
                {
                    menuName: '社区感知',
                    path: '/lyout/house'
                    path: '/layout/house'
                },
                {
                    menuName: '警力资源',
                    path: '/lyout/police'
                    path: '/layout/police'
                }
            ],
            menuRightList: [
                {
                    menuName: '视频监控',
                    path: '/lyout/video',
                    path: '/layout/video',
                    childrenFlag: false,
                    children: [
                        {
                            menuName: '列表查询',
                            path: '/lyout/video/list'
                            path: '/layout/video/list'
                        },
                        {
                            menuName: '空间查询',
                            path: '/lyout/video/region'
                            path: '/layout/video/region'
                        }
                    ]
                },
                {
                    menuName: '安保活动',
                    path: '/lyout/activity'
                    path: '/layout/activity'
                },
                {
                    menuName: '运维管理',
@@ -141,7 +141,7 @@
            boxWidth: 0,
            currentUrl: '/lyout/home',
            currentUrl: '/layout/home',
            userOn: false,
            isShowUserDetail: false,
            user: {}
@@ -165,7 +165,7 @@
                    document.querySelector('.image-switch-img-btn').classList.remove('shrink-btn')
                })
                if (this.currentUrl == '/lyout/home') {
                if (this.currentUrl == '/layout/home') {
                    this.leftShow = false
                } else {
                    this.leftShow = true
src/views/login/index.vue
@@ -56,7 +56,7 @@
export default {
    name: 'AppRegister',
    data() {
    data () {
        return {
            user: {
                username: '',
@@ -106,7 +106,7 @@
            newAxios: null
        }
    },
    created() {
    created () {
        var that = this
        document.onkeydown = (e) => {
@@ -117,7 +117,7 @@
        }
    },
    methods: {
        onLogin() {
        onLogin () {
            this.$refs.formName.validate((valid) => {
                if (valid) {
                    nprogress.start()
@@ -126,14 +126,14 @@
                        lock: true,
                        text: '登录中,请稍后。。。',
                        spinner: "el-icon-loading"
                    });
                    })
                    this.$store.dispatch("LoginByUsername", this.loginForm).then((res) => {
                        //跳转首页
                        this.$router.push({ path: "/lyout/home" });
                        loading.close();
                        this.$router.push({ path: "/layout/home" })
                        loading.close()
                    }).catch(() => {
                        loading.close();
                    });
                        loading.close()
                    })
                }
            })
        }
@@ -142,9 +142,7 @@
</script>
<style scoped lang="scss">
.login-btn{
.login-btn {
    background-color: #409EFF;
    border-radius: 2px;
    height: 30px;
@@ -153,7 +151,7 @@
    font-size: 14px;
}
.login-btn:hover{
.login-btn:hover {
    background-color: #66B1FF;
}