Merge remote-tracking branch 'origin/master'

jiangping

2024-10-14 467d1d504bd0740b9966417eb5ef5098237abe17

Merge remote-tracking branch 'origin/master'

 screen/src/components/percent.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
<template>
  <div class="plan_wrap">
    <div class="plan" :style="{
      background: 'linear-gradient(to right, #1e3c48 0%, #6feef1 100%)',
      width: `${rate}%`
    }"></div>
  </div>
</template>

<script setup>
const props = defineProps({
  rate: Number,
  color: String
})
</script>

<style lang="scss" scoped>
.plan_wrap{
  width: 100%;
  background-color: #172630;
  padding: 4px;
  height: 18px;
  .plan{
    height: 10px;
  }
}
</style>

 screen/src/views/LogisticsEfficiency.vue

@@ -183,24 +183,48 @@
              </div>
              <div class="list">
                <div class="item">
                  <div class="icon"></div>
                  <div class="text">合肥厂</div>
                  <div class="num">100万支 | 55%</div>
                  <div class="line">
                    <div :style="{ background: colors[0] }" class="icon"></div>
                    <div class="text">合肥厂</div>
                  </div>
                  <div :style="{ color: colors[0] }" class="num">100万支 | 55%</div>
                </div>
                <div class="item">
                  <div :style="{ background: colors[0] }" class="icon"></div>
                  <div class="text">集散中心</div>
                  <div class="num">100万支 | 55%</div>
                  <div class="line">
                    <div :style="{ background: colors[1] }" class="icon"></div>
                    <div class="text">集散中心</div>
                  </div>
                  <div :style="{ color: colors[1] }" class="num">100万支 | 55%</div>
                </div>
                <div class="item">
                  <div :style="{ background: colors[1] }" class="icon"></div>
                  <div class="text">市公司</div>
                  <div class="num">100万支 | 55%</div>
                  <div class="line">
                    <div :style="{ background: colors[2] }" class="icon"></div>
                    <div class="text">市公司</div>
                  </div>
                  <div :style="{ color: colors[2] }" class="num">100万支 | 55%</div>
                </div>
              </div>
            </div>
          </div>
          <div class="right_box_three"></div>
          <div class="right_box_three">
            <div class="com_header">
              <div class="title">
                <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
                <div>库存情况</div>
              </div>
              <img src="@/assets/images/title@2x.png" class="bg" alt="" />
            </div>
            <div class="repertory">
              <div class="use_ratio">
                <div class="header">
                  <div>库存量 <span class="num">80/100</span></div>
                  <div>利用率 88%</div>
                </div>
                <Percent :rate="80" />
              </div>
              <div class="list"></div>
            </div>
          </div>
        </div>
      </div>
    </div>
@@ -210,7 +234,9 @@
<script setup>
import { ref, onMounted } from 'vue'
import VScaleScreen from 'v-scale-screen'
import Percent from '@/components/percent.vue'
import dayjs from 'dayjs'

import * as echarts from 'echarts'
const colors = ['#FEAF01', '#01ABFE', '#51F9E4']
const weekMap = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六',]
@@ -666,13 +692,14 @@

        .echart_wrap {
          position: relative;

          .pie_text {
            width: 104px;
            height: 104px;
            border: 1px dashed;
            border-radius: 50%;
            position: absolute;
            

            left: 50%;
            top: 50%;
            transform: translate(-50%, -50%);
@@ -682,7 +709,8 @@
            justify-content: center;
            align-items: center;
            font-size: 14px;
            .fs30{

            .fs30 {
              font-size: 30px;
            }
          }
@@ -695,27 +723,34 @@

        .list {
          margin-left: 36px;

          .item {
            display: flex;
            align-items: center;
            margin: 8px 0;

            .icon {
              width: 16px;
              height: 16px;
              border-radius: 50%;
              margin-right: 6px;
              background: linear-gradient(270deg, #29aeff 0%, #207ff7 100%);
            margin-bottom: 14px;
            font-size: 14px;
            &:nth-last-child(1){
              margin: 0;
            }

            .text {
              margin-right: 6px;
            .line {
              display: flex;
              align-items: center;
              margin-bottom: 6px;
              .icon {
                width: 12px;
                height: 12px;
                border-radius: 50%;
                margin-right: 10px;
                background: linear-gradient(270deg, #29aeff 0%, #207ff7 100%);
              }
            }
            .num{
              margin-left: 20px;
            }
          }
        }
      }
    }
    .right_box_three{

    }
  }
}