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

廖井涛

5 天以前 ceb1dea2b24d5c3216816f42fd0e514613656416

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

 north-glass-erp/northglass-erp/src/assets/main.css

@@ -7,8 +7,8 @@
  font-weight: normal;
  height: 100%;
  width: 100%;
  /*min-width: 1536px;
  min-height: 730px;*/
  min-width: 1536px;
  min-height: 730px;

}
@media (max-width: 500px) {

 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%;
}

*{

 north-glass-erp/northglass-erp/src/views/LoginView.vue

@@ -192,11 +192,13 @@
</template>

<style scoped>

.mainDiv1{
//background-color: #1890FF;
  //overflow: hidden;
  width: 100%;
  height: 100%;
  width: 100vw;
  height: 100vh;

  display: grid;
  place-items: center; /* 同时水平和垂直居中 */
}

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -1053,6 +1053,7 @@
        List<Order> list = orderMapper.selectList(new LambdaQueryWrapper<Order>()
                .apply("create_order > 0")
                .apply("date(create_time) between {0} and {1}",startDate, endDate)
                .orderByDesc(Order::getOrderId)
        );
        Integer quantity = 0;
        Double area = 0.00;