Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

zhanghua

2022-11-04 7cf8c1c27ded519cde2e0c3b0099a6a00dabcd9c

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

 src/views/layout/components/Header/index.vue

@@ -1,6 +1,6 @@
<template>
  <!-- 头部 -->
  <el-header>
  <el-header v-if="show">
    <!-- 左侧菜单 -->
    <div class="header-left">
      <div class="menu-left__item" v-for="(item, index) in menuLeftList" :key="item.id" @click="changeActive(index)">
@@ -15,10 +15,10 @@
      </div>
      <!-- 登录用户 -->
      <div class="menu-right__item user" @mousemove="flag.user = true" @mouseleave="flag.user = false">
        <el-avatar :size="20" :src="user.icon" v-if="user.icon"></el-avatar>
        <el-avatar :size="20" :src="user.user.icon" v-if="user.user.icon"></el-avatar>
        <el-avatar :size="20" src="https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png" v-else>
        </el-avatar>
        <span style="padding: 0 5px;">{{ user.username}}</span>
        <span style="padding: 0 5px;">{{ user.user.username}}</span>
        <i class="el-icon-arrow-down"></i>
        <!-- 用户操作 -->
        <div class="user-card" v-if="flag.user" @mouseleave="flag.user = false">
@@ -69,27 +69,27 @@
      </el-dialog>
      <el-dialog :visible.sync="baseInformationVisible" width="35%" title="基本信息" v-if="baseInformationVisible"
        :before-close="handleClose">
        <el-form :model="user" class="info" label-width="6vw">
        <el-form :model="info" class="info" label-width="6vw">
          <el-form-item label="用户ID" min-width="6">
            <el-input v-model="user.id"></el-input>
            <el-input v-model="info.id"></el-input>
          </el-form-item>
          <el-form-item prop="nickName" label="用户名称" min-width="10">
            <el-input v-model="user.nickName"></el-input>
            <el-input v-model="info.nickName"></el-input>
          </el-form-item>
          <el-form-item  prop="nickName" label="所属姓名" min-width="8">
            <el-input v-model="user.username"></el-input>
            <el-input v-model="info.username"></el-input>
          </el-form-item>
          <el-form-item  prop="mobile" label="联系方式" min-width="7">
            <el-input v-model="user.mobile"></el-input>
            <el-input v-model="info.mobile"></el-input>
          </el-form-item>
          <!-- <el-form-item  prop="departName" label="所属部门" min-width="8">
            <el-input v-model="user.mobile"></el-input>
          </el-form-item> -->
          <el-form-item prop="jobTitle" label="所属职务" min-width="8">
            <el-input v-model="user.jobTitle"></el-input>
            <el-input v-model="info.jobTitle"></el-input>
          </el-form-item>
          <el-form-item prop="createTime" label="创建时间" min-width="10">
            <el-input v-model="user.createTime"></el-input>
            <el-input v-model="info.createTime"></el-input>
          </el-form-item>
        </el-form>

@@ -156,10 +156,13 @@
        },
      ],
      keyword: '',
      info:null,
      show:false
    };
  },
  created() {
    this.getLoginInfo();
    this.setLoginInfo()
    console.log(this.user)
  },
  methods: {
    baseInfo() {
@@ -171,7 +174,7 @@
      })
        .then(res => {
          sessionStorage.setItem('user', JSON.stringify(res.data));
          this.user = res.data.user;
          this.info = res.data.user;
        })
    },
    handleClose(done) {
@@ -210,22 +213,27 @@
        }
      })
    },
    // 获取登录用户信息
    getLoginInfo() {
    // 设置用户基本信息
    async setLoginInfo() {
      const info = JSON.parse(sessionStorage.getItem('user'));
      if (info) {
        console.log(info)
        this.user = info;
      } else {
        this.user = await this.getLoginInfo();
        console.log(this.user)
      }
      this.show = true
    },
    // 获取登录用户信息
    async getLoginInfo(){
        const name = sessionStorage.getItem('name');
        this.$axios({
        let res = await this.$axios({
          method: 'get',
          url: 'sccg/admin/info?name=' + name,
        })
          .then(res => {
            sessionStorage.setItem('user', JSON.stringify(res.data));
            this.user = res.data.user;
          })
      }
        sessionStorage.setItem('user', JSON.stringify(res.data));
        return res.data
    }
  }
};

 src/views/layout/components/Main/index.vue

@@ -87,84 +87,84 @@
              link:'/operate/management/myIndex',
            },
            {
              id:12,
              id:13,
              label:'我的待办',
              link:'/operate/myWait',
            },
            {
              id:12,
              id:14,
              label:'案卷查询',
              link:'/operate/viewEvent',
            },
             {
              id:12,
              id:15,
              label:'车辆管理',
              link:'/operate/car/carIndex',
            },
             {
              id:12,
              id:16,
              label:'图片管理',
              link:'/operate/images',
            },
             {
              id:12,
              id:17,
              label:'视频管理',
              link:'/operate/videoControl',
            },
            {
              id:12,
              id:18,
              label:'消息管理',
              link:'/operate/message/messageIndex',
            },
            {
              id:12,
              id:19,
              label:'短信管理',
              link:'/operate/sms/smsIndex',
            },
             {
              id:12,
              id:20,
              label:'日志管理',
              link:'/operate/log',
            },
          ]
        },
        {
          id:1,
          id:21,
          title:'视频巡查',
          children:[
            {
              id:2,
              id:22,
              label:'视频巡查',
              link:'/video',
            },
          ]
        },
        {
          id:1,
          id:23,
          title:'智能巡查',
          children:[
            {
              id:2,
              id:24,
              label:'预警研判',
              link:'/studyJudge',
            },
            {
              id:3,
              id:25,
              label:'违规检索',
              link:'/illegalSearch',
            },
            {
              id:4,
              id:26,
              label:'趋势分析',
              link:'/trendAnalysis',
            },
            {
              id:5,
              id:27,
              label:'违章统计',
              link:'/trendAnalysis',
            },
            {
              id:6,
              id:28,
              label:'违法统计',
              link:'/typeStatistics',
            },
@@ -181,7 +181,6 @@
  methods:{
    handleJump(url){
      const baseURL = '/home'
      console.log(url)
      // 路由跳转
      this.$router.push({path:baseURL+url})
    }

 src/views/layout/components/Menu/index.vue

@@ -42,7 +42,6 @@

                <el-menu-item
                  v-else
                  :key="secondMenu.id"
                  :index="`${secondMenu.id}`"
                  :route="{ name: secondMenu.url }"
                  >{{ secondMenu.title }}</el-menu-item