Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/dmMes into dev

jiangping

2023-10-24 349bcef9a96391d22522a3409adf5a89e7e70a95

 screen_standard/src/views/index.vue

@@ -1,26 +1,7 @@
<template>
  <div class="content1">
    <div class="content_left">
      <!-- 当日员工产量TOP10 -->
      <div class="content_left_item1">
        <div class="content_left_item1_head">
          <span>当日员工产量TOP10</span>
        </div>
        <div class="content_left_item1_content">
          <div class="content_left_item1_content_row" v-for="(item, index) in data.production" :key="index">
            <div class="content_left_item1_content_row_name">
              <div :class="index > 2 ? 'num bg1' : 'num bg2'">{{ index + 1 }}</div>
              <span>{{ item.userName }}</span>
            </div>
            <div class="content_left_item1_content_row_line">
              <el-progress :show-text="false" :percentage="item.doneNum / baseNum * 100">
              </el-progress>
            </div>
            <div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
          </div>
        </div>
      </div>
      <!-- 仓库实时余量统计 -->
    <!-- <div class="content_left">
    
      <div class="content_left_item2">
        <div class="content_left_item2_head">
          <span>仓库实时余量统计</span>
@@ -45,7 +26,7 @@
          </div>
        </div>
      </div>
    </div>
    </div> -->
    <div class="content_center">
      <!-- 成品计划进度/工序进度 -->
      <div class="content_center_top">
@@ -73,13 +54,12 @@
                <div class="scroll_item_row">{{ item.materialName }}</div>
                <div class="scroll_item_row">{{ item.materialCode }}</div>
                <div class="scroll_item_row">{{ item.num }}</div>
                <div class="scroll_item_row">
                <div class="scroll_item_row" style="text-align: left;">
                  <el-tooltip v-for="(child, i) in item.procedureList" :key="i" effect="dark"
                    :content="'已报工良品数' + child.doneNum + '；工序计划数' + child.planNum" placement="top">
                    <div class="scroll_item_row_item" @click="jump(child.procedureId, child.procedureName)">
                      <div class="scroll_item_row_item_x"></div>
                      <!-- <img v-if="i == 0 || i == 1" src="@/assets/img/ic_complete@2x.png" alt="" /> -->
                      <span v-if="child.rate < 100">{{ child.rate }}%</span>
                      <span v-if="child.rate < 100">{{ child.rate.toFixed(0) }}%</span>
                      <img v-else src="@/assets/img/ic_complete@2x.png" alt="" />
                      <span class="scroll_item_row_item_wz">{{ child.procedureName }}</span>
                    </div>
@@ -110,38 +90,60 @@
                <div class="scroll_item_row">{{ item.qualifiedNum }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedNum }}</div>
                <div class="scroll_item_row">{{ item.undoneNum }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedRate }}%</div>
                <div class="scroll_item_row">{{ (item.unqualifiedRate||0).toFixed(2) }}%</div>
              </div>
            </div>
          </div>
        </div>
      </div>
      <!-- 报工日志 -->
      <div class="content_center_bottom">
        <div class="content_center_bottom_head">
          <span>报工日志</span>
        </div>
        <div class="content_center_bottom_b">
          <div class="content_center_top_form_head">
            <div class="content_center_top_form_head_item">员工名称</div>
            <div class="content_center_top_form_head_item">物料名称</div>
            <div class="content_center_top_form_head_item">物料编码</div>
            <div class="content_center_top_form_head_item">报工时间</div>
            <div class="content_center_top_form_head_item">良品数</div>
            <div class="content_center_top_form_head_item">不良品数</div>
            <div class="content_center_top_form_head_item">不良率</div>
      <div style="display: flex;">
        <div class="content_left" style="flex: 1;">
          <div class="content_left_item1">
            <div class="content_left_item1_head">
              <span>当日员工产量TOP10</span>
            </div>
            <div class="content_left_item1_content" ref="scrollContainer">
              <div class="content_left_item1_content_row" v-for="(item, index) in data.production" :key="index">
                <div class="content_left_item1_content_row_name">
                  <div :class="index > 2 ? 'num bg1' : 'num bg2'">{{ index + 1 }}</div>
                  <span>{{ item.userName }}</span>
                </div>
                <div class="content_left_item1_content_row_line">
                  <el-progress :show-text="false" :percentage="item.doneNum / baseNum * 100">
                  </el-progress>
                </div>
                <div class="content_left_item1_content_row_num">{{ item.doneNum }}</div>
              </div>
            </div>
          </div>
          <div @mouseenter="handleMouseEnter3" @mouseleave="handleMouseLeave3" class="main_container">
            <div ref="scrollContainer3" class="scroll_container">
              <div v-for="(item, index) in data.log" :key="index"
                :class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
                <div class="scroll_item_row">{{ item.userName }}</div>
                <div class="scroll_item_row">{{ item.materialName }}</div>
                <div class="scroll_item_row">{{ item.materialCode }}</div>
                <div class="scroll_item_row">{{ item.createTime }}</div>
                <div class="scroll_item_row">{{ item.qualifiedNum ? item.qualifiedNum : '-' }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedNum }}</div>
                <div class="scroll_item_row">{{ item.unqualifiedRate ? item.unqualifiedRate : '0' }}%</div>
        </div>
        <div class="content_center_bottom">
          <div class="content_center_bottom_head">
            <span>报工日志</span>
          </div>
          <div class="content_center_bottom_b">
            <div class="content_center_top_form_head">
              <div class="content_center_top_form_head_item">员工名称</div>
              <div class="content_center_top_form_head_item">物料名称</div>
              <div class="content_center_top_form_head_item">工序</div>
              <div class="content_center_top_form_head_item">报工时间</div>
              <div class="content_center_top_form_head_item">良品数</div>
              <div class="content_center_top_form_head_item">不良品数</div>
              <div class="content_center_top_form_head_item">不良率</div>
            </div>
            <div @mouseenter="handleMouseEnter3" @mouseleave="handleMouseLeave3" class="main_container">
              <div ref="scrollContainer3" class="scroll_container">
                <div v-for="(item, index) in data.log" :key="index"
                  :class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
                  <div class="scroll_item_row">{{ item.userName }}</div>
                  <div class="scroll_item_row">{{ item.materialName }}</div>
                  <div class="scroll_item_row">{{ item.procedureName }}</div>
                  <div class="scroll_item_row">{{ dateToSub(item.createTime) }}</div>
                  <div class="scroll_item_row">{{ item.qualifiedNum || 0 }}</div>
                  <div class="scroll_item_row">{{ item.unqualifiedNum || 0 }}</div>
                  <div class="scroll_item_row">{{ (item.unqualifiedRate || 0).toFixed(2) }}%</div>
                </div>
              </div>
            </div>
          </div>
@@ -155,16 +157,20 @@
          <span>近7天不良品分布</span>
        </div>
        <div class="content_right_top_nr">
          <div class="content_right_top_nr_bottom_yuan" v-if="data.typeDistribution.length > 0">
            <span>{{ data.num }}</span>
            <span>不良项分布</span>
          </div>

          <div class="content_right_top_nr_top" id="lineChrat"></div>
          <div class="content_right_top_nr_bottom" id="pieChart"></div>
          <div class="content_right_top_nr_bottom">
            <div class="content_right_top_nr_bottom_yuan" v-if="data.typeDistribution.length > 0">
              <span>{{ data.num }}</span>
              <span>不良项分布</span>
            </div>
            <div id="pieChart"></div>
          </div>

        </div>
      </div>
      <!-- 设备巡检记录 -->
      <div class="content_right_bottom">
      <div class="content_right_bottom" ref="bottom1">
        <div class="content_right_bottom_head">
          <span>设备巡检记录</span>
        </div>
@@ -179,9 +185,12 @@
            <div ref="scrollContainer4" class="scroll_container">
              <div v-for="(item, index) in data.patrolInspection" :key="index"
                :class="index % 2 == 0 ? 'scroll_item scroll_item_bg1' : 'scroll_item scroll_item_bg2'">
                <div class="scroll_item_row">{{ item.checkdate }}</div>
                <div class="scroll_item_row">{{ dateToSub(item.checkdate) }}</div>
                <div class="scroll_item_row">{{ item.deviceName }}</div>
                <div class="scroll_item_row">{{ item.status == 0 ? '合格' : '不合格' }}</div>
                <div class="scroll_item_row">
                  <span v-if="item.status == 0">正常</span>
                  <span v-else style="color: #F84F26">异常</span>
                </div>
                <div class="scroll_item_row">{{ item.userName }}</div>
              </div>
            </div>
@@ -193,6 +202,7 @@
</template>

<script setup>
import { dateToSub } from '@/utils'
import { reactive, ref, onMounted, nextTick, onUnmounted, computed, watch, toRefs } from 'vue'
import { getPlanData, getTop, getStockList, getWorkPlansList, getProcedureProcessList, getRecordLogPage, getDeviceCheckPage, getUnqualified7DayData, getUnqualifiedCateData } from '@/utils/api.js'
import { useCounterStore } from '@/stores/counter.js'
@@ -211,10 +221,11 @@
  dayDistribution: [],
  typeDistribution: [],
  num: 0,
  baseNum: 0
  baseNum: 0,
  bottomAuthHeight: 284
})

let { baseNum } = toRefs(data)
let { baseNum, bottomAuthHeight } = toRefs(data)

let timer = ref(null)
let timer1 = ref(null)
@@ -227,6 +238,7 @@
let scrollContainer2 = ref(null)
let scrollContainer3 = ref(null)
let scrollContainer4 = ref(null)
let bottom1 = ref(null)
let cate = ref([
  {
    name: '成品计划进度',
@@ -267,33 +279,53 @@
start1()

const init = () => {
  setBottomHeight();
  // 当日员工产量TOP10
  getTop(companyId.value, departId.value)
    .then(res => {
      if (res.length > 0) {
        data.baseNum = res[0].doneNum
        data.production = res
      } else {
        data.baseNum = 0
      }
      data.production = res
      data.fifthScroll = true
    })
  // 仓库实时余量统计
  getStockList(companyId.value, departId.value)
    .then(res => {
      data.marginStatistics = res
      nextTick(() => {
        start()
      })
    })
  // 成品计划进度
  getWorkPlansList(companyId.value, departId.value)
    .then(res => {
      data.plannedProgress = res
      nextTick(() => {
        start1()
      })
    })
  // getStockList(companyId.value, departId.value)
  //   .then(res => {
  //     data.marginStatistics = res
  //     nextTick(() => {
  //       start()
  //     })
  //   })
  cate.value.forEach((item, index) => {
    if (item.active) {
      if (index == 1) {
        getProcedureProcessList(companyId.value, departId.value)
          .then(res => {
            data.processProgress = res
            nextTick(() => {
              start2()
            })
          })
      } else {
        // 成品计划进度
        getWorkPlansList(companyId.value, departId.value)
          .then(res => {
            data.plannedProgress = res
            nextTick(() => {
              start1()
            })
          })
      }
    }
  })


  // 报工日志
  getRecordLogPage(companyId.value, departId.value, {
    capacity: 9999,
    capacity: 20,
    model: {},
    page: 1
  }).then(res => {
@@ -347,6 +379,10 @@
      enterprise.setNum(res)
    })
}
function  setBottomHeight(){
  const pageHeight = window.innerHeight;
  bottomAuthHeight = pageHeight - 700;
}

/**
 * 七日折线图
@@ -371,6 +407,12 @@
        fontSize: 12
      }
    },
    grid: {
      top: 40,
      bottom: 30,
      left: 60,
      right: 10
    },
    xAxis: {
      type: 'category',
      boundaryGap: false,
@@ -378,6 +420,15 @@
        lineStyle: {
          width: 0.5,
          color: ['#fff']
        }
      },
      axisLine: {
        show: true,
        onZero: true,
        lineStyle: {
          width: 0.5,
          color: '#fff',
          opacity: .5
        }
      },
      axisLabel: {
@@ -394,6 +445,15 @@
        lineStyle: {
          width: 0.5,
          color: ['#fff']
        }
      },
      axisLine: {
        show: true,
        onZero: true,
        lineStyle: {
          width: 1,
          color: '#fff',
          opacity: .5
        }
      },
      axisLabel: {
@@ -518,14 +578,6 @@
  }
  option && myChart.setOption(option);
}

// onBeforeUnmount(()=>{
//     clearTimeout(timer.value)
//     clearTimeout(timer1.value)
//     clearTimeout(timer2.value)
//     clearTimeout(timer3.value)
//     clearTimeout(timer4.value)
// })
onUnmounted(() => {
  clearTimeout(timer.value)
  clearTimeout(timer1.value)
@@ -630,19 +682,21 @@
}
function ListScroll() {
  let scrollDom = scrollContainer.value
  if (!scrollDom) return
  // 判读组件是否渲染完成
  if (scrollDom.offsetHeight == 0) {
    scrollDom = scrollContainer.value
  } else {
    let maxLength = scrollDom.clientHeight/34
    // 如果列表数量过少不进行滚动
    if (scrollDom.children.length < 8) {
    if (scrollDom.children.length <= maxLength) {
      clearTimeout(timer.value)
      return
    }
    // 组件进行滚动
    scrollDom.scrollTop += 1
    scrollDom.scrollTop += 2
    // 判断是否滚动到底部
    if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
    if (Math.floor(scrollDom.scrollTop) >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
      // 获取组件第一个节点
      let first = scrollDom.children[0]
      // 删除节点
@@ -655,18 +709,22 @@
function ListScroll1() {
  let scrollDom = scrollContainer1.value
  // 判读组件是否渲染完成
  if (!scrollDom) return
  if (scrollDom.offsetHeight == 0) {
    scrollDom = scrollContainer1.value
  } else {
    // 如果列表数量过少不进行滚动
    if (scrollDom.children.length < 7) {
    if (scrollDom.children.length <= 6) {
      clearTimeout(timer1.value)
      return
    }
    // console.log(data.plannedProgress);
    // 组件进行滚动
    scrollDom.scrollTop += 1
    scrollDom.scrollTop += 2
    // scrollDom.scrollTo(0, scrollDom.scrollTop + 3)
    // console.log('2-----',scrollDom.scrollTop, scrollDom.scrollHeight, scrollDom.clientHeight );
    // 判断是否滚动到底部
    if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
    if (scrollDom.scrollTop && scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
      // 获取组件第一个节点
      let first = scrollDom.children[0]
      // 删除节点
@@ -678,19 +736,23 @@
}
function ListScroll2() {
  let scrollDom = scrollContainer2.value
  if (!scrollDom) return
  // 判读组件是否渲染完成
  if (scrollDom.offsetHeight == 0) {
    scrollDom = scrollContainer2.value
  } else {
    // 如果列表数量过少不进行滚动
    if (scrollDom.children.length < 7) {
    if (scrollDom.children.length <= 10) {
      clearTimeout(timer2.value)
      return
    }
    // 组件进行滚动
    scrollDom.scrollTop += 1
    scrollDom.scrollTo(0, scrollDom.scrollTop + 1) // += 1
    // scrollDom.scrollTop(scrollDom.scrollTop + 1)
    // console.log('scrollDom.scrollTop', scrollDom.scrollTop);
    // console.log('scrollDom.scrollHeight - scrollDom.clientHeight', scrollDom.scrollHeight - scrollDom.clientHeight);
    // 判断是否滚动到底部
    if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
    if (scrollDom.scrollTop &&scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
      // 获取组件第一个节点
      let first = scrollDom.children[0]
      // 删除节点
@@ -702,19 +764,23 @@
}
function ListScroll3() {
  let scrollDom = scrollContainer3.value
  if (!scrollDom) return
  // 判读组件是否渲染完成
  if (scrollDom.offsetHeight == 0) {
    scrollDom = scrollContainer3.value
  } else {
    // 如果列表数量过少不进行滚动
    if (scrollDom.children.length < 6) {
    let num = scrollContainer3.value.offsetHeight / 35;
    // alert(scrollDom.children.length  +"---------------"+num)
    // 如果列表数量过少不进行滚动
    if (scrollDom.children.length <= num) {
      clearTimeout(timer3.value)
      return
    }
    // 组件进行滚动
    scrollDom.scrollTop += 1
    scrollDom.scrollTop = scrollDom.scrollTop+2
    // 判断是否滚动到底部
    if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
    if (scrollDom.scrollTop && scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
      // 获取组件第一个节点
      let first = scrollDom.children[0]
      // 删除节点
@@ -726,19 +792,25 @@
}
function ListScroll4() {
  let scrollDom = scrollContainer4.value
  if (!scrollDom) return
  // 判读组件是否渲染完成
  if (scrollDom.offsetHeight == 0) {
  if (scrollDom.scrollTop && scrollDom.offsetHeight == 0) {
    scrollDom = scrollContainer4.value
  } else {
    // 如果列表数量过少不进行滚动
    if (scrollDom.children.length < 7) {
    // console.log(scrollDom.offsetHeight);
    let num = scrollDom.offsetHeight / 35;
    num = num + (scrollDom.offsetHeight % 35  > 0 ? 1 : 0)
    if (scrollDom.children.length <= num) {
      clearTimeout(timer4.value)
      return
    }
    // 组件进行滚动
    scrollDom.scrollTop += 1
    
    // 判断是否滚动到底部
    if (scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
    if (scrollDom.scrollTop && scrollDom.scrollTop >= (scrollDom.scrollHeight - scrollDom.clientHeight)) {
    // if (scrollDom.scrollTop >= 35) {
      
      // 获取组件第一个节点
      let first = scrollDom.children[0]
      // 删除节点
@@ -754,13 +826,31 @@
// })

onMounted(() => {
  if (!departId.value) return;
  timer5.value = setInterval(init(), 60000)
  if (departId.value) {
    console.log('onMounted');
    init()
    timer5.value = setInterval(init, 60000)
    // timer.value = setInterval(scrillAction, 100)
  }
  window.addEventListener('resize', () => {
    setTypeChart()
    setDayChart()
  })
  
})

onUnmounted(() => {
  clearTimeout(timer.value)
  clearTimeout(timer5.value)
  
})
</script>

<style lang="scss" scoped>

$fixed-height: 690px;
.content1 {
  flex: 1;
  width: 100%;
  height: auto;
  display: flex;
@@ -769,9 +859,11 @@

  .content_left {
    flex: 1;
    margin-right: 20px;
    .content_left_item1 {
      width: 100%;
      height: 398px;
      height:  calc(100vh - 690px);
    //  height: 284px;
      margin-bottom: 20px;
      .content_left_item1_head {
        background: url('@/assets/img/home_title_short@2x.png');
@@ -795,8 +887,9 @@

      .content_left_item1_content {
        width: 100%;
        height: 360px;
        height: calc(100% - 36px);
        padding: 20px;
        overflow: hidden;
        box-sizing: border-box;
        background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);

@@ -805,7 +898,8 @@
          display: flex;
          align-items: center;
          justify-content: space-between;
          margin-bottom: 13px;
          // margin-bottom: 13px;
          padding: 7px 0;

          &:last-child {
            margin: 0;
@@ -878,8 +972,6 @@
    .content_left_item2 {
      width: 100%;
      flex: 1;
      display: flex;
      flex-direction: column;
      .content_left_item2_head {
        background: url('@/assets/img/home_title_short@2x.png');
        background-repeat: no-repeat;
@@ -903,14 +995,13 @@
      .content_left_item2_content {
        width: 100%;
        height: 361px;
        height: 100%;
        padding: 20px;
        box-sizing: border-box;
        background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);

        .item2_content_head {
          width: 100%;
          height: 36px;
          height: 35px;
          display: flex;
          align-items: center;
          background: rgba(52, 88, 159, 0.5);
@@ -934,7 +1025,7 @@

        .main_container {
          width: 100%;
          height: calc(100% - 36px);
          height: calc(100% - 38px);

          .scroll_container {
            width: 100%;
@@ -951,7 +1042,7 @@

            .scroll_item {
              width: 100%;
              height: 36px;
              height: 35px;
              display: flex;
              align-items: center;

@@ -980,17 +1071,17 @@
  }

  .content_center {
    flex: 2;
    margin: 0 20px;
    flex: 3;
    margin-right: 20px;
    .content_center_top {
      width: 100%;
      height: 509px;
      height: 424px;
      margin-bottom: 20px;
      background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);

      .content_center_top_list {
        width: 100%;
        height: 38px;
        height: 35px;
        display: flex;
        align-items: center;

@@ -1005,9 +1096,9 @@
        }
        .content_center_top_list_item {
          width: 200px;
          height: 38px;
          height: 35px;
          cursor: pointer;
          line-height: 38px;
          line-height: 35px;
          padding-left: 34px;
          box-sizing: border-box;
          font-size: 16px;
@@ -1048,7 +1139,8 @@
            color: #01D9FE;

            &:nth-child(5) {
              flex: 2.7;
              flex: 3;

            }
          }
        }
@@ -1056,7 +1148,6 @@
        .main_container {
          width: 100%;
          height: calc(100% - 34px);

          .scroll_container {
            width: 100%;
            height: 100%;
@@ -1072,10 +1163,9 @@

            .scroll_item {
              width: 100%;
              height: 58px;
              height: 50px;
              display: flex;
              align-items: center;

              .scroll_item_row {
                flex: 1;
                height: 100%;
@@ -1090,14 +1180,16 @@

                &:nth-child(5) {
                  flex: 3;
                  justify-content: start;
                }

                .scroll_item_row_item {
                  margin-top: -11px;
                  width: 29px;
                  height: 29px;
                  border-radius: 50%;
                  margin-right: 19px;
                  display: flex;
                  flex-direction: column;
                  align-items: center;
                  justify-content: center;
                  border: 2px solid #01D9FE;
@@ -1209,7 +1301,7 @@

            .scroll_item {
              width: 100%;
              height: 36px;
              height: 35px;
              display: flex;
              align-items: center;

@@ -1244,8 +1336,9 @@

    .content_center_bottom {
      width: 100%;
      height: 286px;

     // height: 284px;
      height:  calc(100vh - 690px);
      flex: 2;
      .content_center_bottom_head {
        width: 100%;
        height: 38px;
@@ -1317,7 +1410,7 @@

            .scroll_item {
              width: 100%;
              height: 37px;
              height: 35px;
              display: flex;
              align-items: center;

@@ -1346,10 +1439,9 @@

  .content_right {
    flex: 1;

    .content_right_top {
      width: 100%;
      height: 511px;
      height: 425px;
      margin-bottom: 20px;

      .content_right_top_head {
@@ -1376,15 +1468,18 @@
        height: calc(100% - 38px);
        background: linear-gradient(180deg, rgba(52, 88, 159, 0) 0%, rgba(0, 86, 255, 0.4) 100%);
        position: relative;

        #pieChart {
          width: 100%;
          height: 100%;
        }
        .content_right_top_nr_bottom_yuan {
          position: absolute;
          top: 50%;
          left: 50%;
          transform: translate(-50%, 53%);
          transform: translate(-50%, -50%);
          z-index: 999;
          width: 114px;
          height: 114px;
          width: 100px;
          height: 100px;
          border-radius: 50%;
          border: 2px dashed #01D9FE;
          display: flex;
@@ -1419,14 +1514,16 @@
        .content_right_top_nr_bottom {
          width: 100%;
          height: 50%;
          position: relative;
        }
      }
    }

    .content_right_bottom {
      width: 100%;
      height: 284px;
     // height: 284px;

      height:  calc(100vh - 690px);
      .content_right_bottom_head {
        width: 100%;
        height: 38px;
@@ -1455,7 +1552,7 @@

        .item2_content_head {
          width: 100%;
          height: 36px;
          height: 35px;
          display: flex;
          align-items: center;
          background: rgba(52, 88, 159, 0.5);
@@ -1479,7 +1576,7 @@

        .main_container {
          width: 100%;
          height: calc(100% - 36px);
          height: calc(100% - 35px);

          .scroll_container {
            width: 100%;
@@ -1496,7 +1593,7 @@

            .scroll_item {
              width: 100%;
              height: 36px;
              height: 35px;
              display: flex;
              align-items: center;