Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

8 天以前 97fba4a0e38c0b8455d43d2935aa996676407361

 north-glass-erp/northglass-erp/src/layout/MainErpView.vue

@@ -6,6 +6,7 @@
import {onMounted, reactive, ref, watch} from "vue"
import deepClone from "@/utils/deepClone"
import userInfo from '@/stores/userInfo'

import {Close, Grid, Histogram, MessageBox, SwitchButton} from "@element-plus/icons-vue"
import { useI18n } from 'vue-i18n'
import i18n from "@/lang/index"
@@ -16,7 +17,9 @@

const router = useRouter()
const userStore = useUserInfoStore()
const user = userStore.user.userName
const user = userStore.user?.userName


//监听异步返回代码
watch(()=>userStore.responseCode,(newVal) => {
    switch (newVal){
@@ -45,7 +48,7 @@
  }
)

store.createWebSocket();
//store.createWebSocket();

// 退出登录
function quit(){
@@ -64,12 +67,16 @@

//提取模块列表
let menuList=$ref([])
onMounted(()=>{
  request.get(`/menu/getMenu/${lang}`).then((res) => {
onMounted(async ()=>{
  await request.get(`/menu/getMenu/${lang}`).then((res) => {
    if(res.code==200){
      menuList= deepClone(res.data)
    }
  })

  if(userStore.user.address!==null){
      router.push({path:'/main/reportingWorks/addReportingWork'})
  }

})

@@ -98,9 +105,7 @@
    {deep:true}
)

router.beforeEach((to, from) => {
  //return false
})



let openFlag = $ref(null)
@@ -117,21 +122,18 @@
</script>

<template>
  <div>
    <el-container>
  <div style="height:100%;width:100%">
    <el-container id="el-container1">
      <el-header >
        <div style="height: 100%;width: 100%;display: flex">
          <img src="../assets/northGlass.ico" alt="" style="max-width: 100%;max-height: 100%">
          <h3 style="margin: 1rem  ;font-weight: bold;width: 40vw;"> {{$t('main.titleFirst') + user + $t('main.titleLast')}}</h3>
          <span style="height: 70%;width: 78vw;margin-top: 1.5rem;" >

<!--            <el-button   class="sys-quit" @click="quit"  type="info" round>-->
          <h3 style="margin: 1rem  ;font-weight: bold;width: 95%;"> {{$t('main.titleFirst') + user + $t('main.titleLast')}}</h3>
          <span style="height: 70%;width: 10%;margin-top: 1.5rem;" >
              <el-icon @click="quit"  style="float: right;margin-right: 1rem" size="large" ><SwitchButton  size=""/></el-icon>
<!--            </el-button>-->
          </span>
        </div>
      </el-header>
      <el-container >
      <el-container  id="el-container2">
        <el-aside width="160px" style="height: 97%; " >
<!--          <el-menu
              style=" border-radius:0.5rem;border: 0.01rem solid #409EFF;margin-bottom: 0.5rem"
@@ -165,19 +167,36 @@
          </el-menu>-->
          <div class="menu"  >
              <div v-for="items in menuList">
                <div class='menu_title' @click="openMenu(items.id)"  >{{items.menuName}}<span class='indicator' >▼</span></div>
                <el-tooltip
                    class="box-item"
                    effect="dark"
                    :content="$t('menu.'+items.id)"
                    placement="right"
                    show-after="500"
                >
                <div class='menu_title' @click="openMenu(items.id)"  >{{$t('menu.'+items.id)}}<span class='indicator' >▼</span></div>
                </el-tooltip>
                <ul class='enter-x-left' v-show="openFlag==items.id">

                  <li v-for="menuItem in menuItemList"
                      v-show="items.id==menuItem.menuID"
                      style="margin-bottom: 2px"
                  <el-tooltip
                      v-for="menuItem in menuItemList"
                      class="box-item"
                      effect="dark"
                      :content="$t('menu.'+menuItem.menu)"
                      placement="right"
                      show-after="500"
                  >
                    <router-link
                        :to="{path:menuItem.url}">
                      {{ menuItem.itemName}}
                    </router-link>
                    <li
                        v-show="items.id==menuItem.menuID"
                        style="margin-bottom: 2px"
                    >

                  </li>
                      <router-link
                          :to="{path:menuItem.url}">
                        {{ $t('menu.'+menuItem.menu)}}
                      </router-link>

                    </li>
                  </el-tooltip>
                </ul>
              </div>
          </div>
@@ -195,9 +214,14 @@
</template>

<style scoped>
.el-container{
  height: 100vh;
  width: 100vw

#el-container1{
  height: 100%;
  width: 100%;
}
#el-container2{
  height:calc(100% - 60px);
  width: 100%;
}

*{