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

@@ -122,17 +122,14 @@
</script>

<template>
  <div>
  <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: 70vw;"> {{$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>
@@ -219,12 +216,12 @@
<style scoped>

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

*{