Merge branch 'dev' of http://114.132.189.42:9002/r/product-inventory-manage...

曹睿

21 小时以前 e03b2546f020327bf9fd414d8869a9ccd2270c2d

 src/layout/components/Navbar.vue

@@ -1,23 +1,22 @@
<template>

  <div class="navbar">

    <div>

      <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />

      <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container"

        @toggleClick="toggleSideBar" />

      <breadcrumb v-if="!settingsStore.topNav" id="breadcrumb-container" class="breadcrumb-container" />

    </div>

<!--    <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />-->

    <!--    <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />-->

    <div class="center-menu">

      <span class="label">{{userStore.currentFactoryName}}</span>

      <span class="label">{{ userStore.currentFactoryName }}</span>

      <el-dropdown @command="handleFactoryChange" class="right-menu-item hover-effect" trigger="click">

        <div>

          <el-icon size="20"><Switch /></el-icon>

          <el-icon size="20">

            <Switch />

          </el-icon>

        </div>

        <template #dropdown>

          <el-dropdown-menu >

            <el-dropdown-item

                v-for="item in factoryList"

                :key="item.deptId"

                :command="item"

            >

          <el-dropdown-menu>

            <el-dropdown-item v-for="item in factoryList" :key="item.deptId" :command="item">

              {{ item.deptName }}

            </el-dropdown-item>

          </el-dropdown-menu>

@@ -114,12 +113,12 @@
}



function getUserLoginFacotryList() {

  if(userStore.id){

    userLoginFacotryList({userId:userStore.id}).then(res => {

  if (userStore.id) {

    userLoginFacotryList({ userId: userStore.id }).then(res => {

      console.log('res', res)

      factoryList.value = res.data

    })

  }else {

  } else {

    factoryList.value = []

  }

}

@@ -129,13 +128,12 @@
  handleLogin(command.deptId);

}



function handleLogin(currentFatoryId){

function handleLogin(currentFatoryId) {

  const loginForm = {

    username: Cookies.get("username"),

    password: Cookies.get("password") === undefined ? null : decrypt(Cookies.get("password")),

    currentFatoryId: currentFatoryId

  }

  console.log('loginForm', loginForm)

  userStore.loginCheckFactory(loginForm).then(res => {

    forceReload();

  }).catch((err) => {

@@ -158,6 +156,7 @@
  position: relative;

  background: var(--navbar-bg);

  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);



  .center-menu {

    line-height: 50px;

    position: absolute;

@@ -165,6 +164,7 @@
    transform: translateX(-50%);

    display: flex;

    align-items: center;



    .label {

      font-weight: bold;

      font-size: 18px;