Merge remote-tracking branch 'origin/anhui-mall-ui-test' into anhui-mall-ui-test

2025-11-20 13:41:29 +08:00 · 2025-11-20 13:41:29 +08:00 · 41472d77d8
parent bc8250e7eb 35f78eb949
commit 41472d77d8
17 changed files with 293 additions and 221 deletions
--- a/src/views/screen/gwScreen/components/center/index.vue
+++ b/src/views/screen/gwScreen/components/center/index.vue
@ -424,6 +424,7 @@ export default {
  methods: {
    handleBtn(index) {
      this.btnIndex = index
+      console.log('🚀 ~ this.btnIndex:', this.btnIndex)
      // this.cityData = []
      // this.getInfo()
    },
@ -814,6 +815,7 @@ export default {
  margin-left: -180px;
  display: flex;
  justify-content: center;
+  z-index: 9999999;
  .btn:not(:last-child) {
    margin-right: 80px;
  }
--- a/src/views/screen/gwScreen/components/left/EquipStatus.vue
+++ b/src/views/screen/gwScreen/components/left/EquipStatus.vue
@ -12,15 +12,16 @@ export default {
  data() {
    return {
      chartData: [
-        // { name: '在用', value: 120 },
-        // { name: '在库', value: 80 },
-        // { name: '在修', value: 60 },
-        // { name: '共享', value: 40 },
+        { name: '在用', value: 45036, proportion: 633 },
+        { name: '在库', value: 9038, proportion: 133 },
+        { name: '在修', value: 15034, proportion: 21 },
+        { name: '共享', value: 1767, proportion: 3 },
      ],
    }
  },
  mounted() {
-    this.getList()
+    // this.getList()
+    this.initChart()
  },
  methods: {
    async getList() {
--- a/src/views/screen/gwScreen/components/left/UnitEquipmentConfig.vue
+++ b/src/views/screen/gwScreen/components/left/UnitEquipmentConfig.vue
@ -5,22 +5,11 @@
      <thead>
        <!-- 第一行：跨列合并 -->
        <tr>
-          <th rowspan="2">序号</th>
-          <th rowspan="2">单位名称</th>
-          <th rowspan="2">装备价值（亿元）</th>
-          <th colspan="4">装备数量（台）</th>
-          <th colspan="4">配置率</th>
-        </tr>
-        <!-- 第二行：子列 -->
-        <tr>
-          <th>总数</th>
-          <th>线路</th>
-          <th>变电</th>
-          <th>电缆</th>
-          <th>总数</th>
-          <th>线路</th>
-          <th>变电</th>
-          <th>电缆</th>
+          <th>序号</th>
+          <th>网省名称</th>
+          <th>装备价值（亿元）</th>
+          <th>装备数量（台）</th>
+          <th>配置率</th>
        </tr>
      </thead>

@ -29,19 +18,11 @@
        <tr v-for="(row, index) in tableData" :key="index">
          <td style="width: 60px">{{ index + 1 }}</td>
          <td style="width: 180px">{{ row.deptName }}</td>
-          <td style="width: 110px">{{ row.totalValue ? (row.totalValue / 100000000).toFixed(4) : 0 }}</td>
+          <td style="width: 110px">{{ row.totalValue }}</td>

          <!-- 装备数量 -->
          <td>{{ row.totalEquipmentQuantity }}</td>
          <td>{{ row.lineNum }}</td>
-          <td>{{ row.substationNum }}</td>
-          <td>{{ row.cableNum }}</td>
-
-          <!-- 配置率 -->
-          <td>{{ row.configRate }}</td>
-          <td>{{ row.valueA }}</td>
-          <td>{{ row.valueB }}</td>
-          <td>{{ row.valueC }}</td>
        </tr>
      </tbody>
    </table>
@ -54,11 +35,42 @@ import { getUnitEquipmentConfigurationApi } from '@/api/wsScreen/index'
 export default {
  data() {
    return {
-      tableData: [],
+      tableData: [
+        {
+          deptName: '安徽省',
+          totalValue: '3.96',
+          totalEquipmentQuantity: '2625',
+          lineNum: '120.00',
+        },
+        {
+          deptName: '陕西省',
+          totalValue: '3.66',
+          totalEquipmentQuantity: '2325',
+          lineNum: '109.00',
+        },
+        {
+          deptName: '河北省',
+          totalValue: '2.96',
+          totalEquipmentQuantity: '2025',
+          lineNum: '119.00',
+        },
+        {
+          deptName: '湖北省',
+          totalValue: '3.86',
+          totalEquipmentQuantity: '2425',
+          lineNum: '105.07',
+        },
+        {
+          deptName: '山东省',
+          totalValue: '3.42',
+          totalEquipmentQuantity: '2405',
+          lineNum: '101.09',
+        },
+      ],
    }
  },
  created() {
-    this.getList()
+    // this.getList()
  },
  methods: {
    async getList() {
@ -88,7 +100,11 @@ td {
  padding: 10px;
  text-align: center;
  white-space: nowrap;
-  border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整
+  /* border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整 */
+  background: linear-gradient(to bottom, #f0f5f8, #5eb6f0);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+  line-height: 23px;
 }

 th {
@ -121,13 +137,13 @@ tbody tr:hover {
  overflow: auto;

  /* 隐藏滚动条轨迹 */
-  -ms-overflow-style: none;  /* IE / Edge */
-  scrollbar-width: none;     /* Firefox */
+  -ms-overflow-style: none; /* IE / Edge */
+  scrollbar-width: none; /* Firefox */
 }

 /* Chrome / Safari */
 .scroll-container::-webkit-scrollbar {
-  width: 0;   /* 或者直接隐藏 */
+  width: 0; /* 或者直接隐藏 */
  height: 0;
  background: transparent; /* 背景透明 */
 }
--- a/src/views/screen/gwScreen/components/left/index.vue
+++ b/src/views/screen/gwScreen/components/left/index.vue
@ -3,7 +3,7 @@
    <div class="top-box">
      <div class="title-tip">
        <div>装备总览</div>
-        <div class="more" @click="handleEquipOverview">更多 ></div>
+        <div class="more" @click="">更多 ></div>
      </div>
      <div class="equip-box">
        <div class="equip-item-1">装备总数</div>
@ -16,13 +16,13 @@
      <div class="item-box">
        <el-row :gutter="20">
          <el-col :span="8" :offset="0">
-            <EquipItem title="线路装备" :state="state1" :pieValues="list1" @openDialog="openEquipItemMore(2)" />
+            <EquipItem title="线路装备" :state="state1" :pieValues="list1" />
          </el-col>
          <el-col :span="8" :offset="0">
-            <EquipItem title="变电装备" :state="state2" :pieValues="list2" @openDialog="openEquipItemMore(1)" />
+            <EquipItem title="变电装备" :state="state2" :pieValues="list2" />
          </el-col>
          <el-col :span="8" :offset="0">
-            <EquipItem title="电缆装备" :state="state3" :pieValues="list3" @openDialog="openEquipItemMore(3)" />
+            <EquipItem title="电缆装备" :state="state3" :pieValues="list3" />
          </el-col>
        </el-row>
      </div>
@ -51,14 +51,14 @@
            <div class="bottom-right">
              <div class="title-tip">
                <div class="tip-title">装备状态</div>
-                <div class="more" @click="openStatusMore">更多 ></div>
+                <div class="more" @click="">更多 ></div>
              </div>
              <div class="equip-status">
                <EquipStatus />
              </div>
            </div>
            <div class="bottom-explain">
-              <div>备注说明：再用装备包含于共享装备。</div>
+              <!-- <div>备注说明：再用装备包含于共享装备。</div> -->
            </div>
          </el-col>
        </el-row>
--- a/src/views/screen/gwScreen/components/right/EquipUsageRate.vue
+++ b/src/views/screen/gwScreen/components/right/EquipUsageRate.vue
@ -2,14 +2,14 @@
  <div>
    <div class="title-tip">
      <div>装备在用率统计</div>
-      <div class="more" @click="openDialog">更多 ></div>
+      <div class="more" @click="">更多 ></div>
    </div>
-    <div style="width: 25%; height: 100%; display: flex; align-items: center; justify-content: space-between">
+    <!-- <div style="width: 25%; height: 100%; display: flex; align-items: center; justify-content: space-between">
      <div :class="tabIndex == 0 ? 'topTab1 fs-24 active1' : 'topTab1 fs-24'" @click="changTab(0)">总体</div>
      <div :class="tabIndex == 1 ? 'topTab2 fs-24 active2' : 'topTab2 fs-24'" @click="changTab(1)">线路</div>
      <div :class="tabIndex == 2 ? 'topTab2 fs-24 active2' : 'topTab2 fs-24'" @click="changTab(2)">变电</div>
      <div :class="tabIndex == 3 ? 'topTab3 fs-24 active3' : 'topTab3 fs-24'" @click="changTab(3)">电缆</div>
-    </div>
+    </div> -->

    <div class="item-list">
      <div class="item" :class="`item-bg-${index + 1}`" v-for="(item, index) in tableList" :key="index">
@ -37,17 +37,43 @@ export default {
  data() {
    return {
      tabIndex: 0,
-      tableList: [],
+      tableList: [
+        {
+          name: '张力机',
+          proportion: 64.58,
+          turnoverRate: 4.08,
+        },
+        {
+          name: '牵引机',
+          proportion: 53.13,
+          turnoverRate: 4.3,
+        },
+        {
+          name: '抱杆',
+          proportion: 46.88,
+          turnoverRate: 2.83,
+        },
+        {
+          name: '滤油机',
+          proportion: 17.71,
+          turnoverRate: 2.66,
+        },
+        {
+          name: '电缆输送机',
+          proportion: 13.54,
+          turnoverRate: 2.51,
+        },
+      ],
    }
  },
  created() {
-    this.getInfo()
+    // this.getInfo()
  },
  methods: {
    changTab(type) {
      console.log('🚀 ~ changTab ~ type:', type)
      this.tabIndex = type
-      this.getInfo()
+      // this.getInfo()
    },
    async getInfo() {
      try {
@ -157,7 +183,7 @@ export default {
 }

 .item-list {
-  margin-top: 15px;
+  margin-top: 30px;
  display: flex;
  align-items: center;
  /* justify-content: space-between; */
--- a/src/views/screen/gwScreen/components/right/ProEquipSituationList.vue
+++ b/src/views/screen/gwScreen/components/right/ProEquipSituationList.vue
@ -8,7 +8,7 @@
            <el-option v-for="item in options" :key="item.proCode" :label="item.proName" :value="item.proCode" />
          </el-select>
        </div>
-        <div style="margin-left: 50px" @click="openDialog">更多 ></div>
+        <div style="margin-left: 50px" @click="">更多 ></div>
      </div>
    </div>

@ -26,7 +26,7 @@
                <img src="../../img/icon3.png" class="icon" />
                <div>
                  <div style="color: #ccc; font-size: 12px; margin-top: 10px">项目数（个）</div>
-                  <div style="font-size: 16px; font-weight: 800">{{ proNum }}</div>
+                  <div style="font-size: 16px; font-weight: 800">{{ 7695 }}</div>
                </div>
              </div>
            </el-col>
@ -35,7 +35,7 @@
                <img src="../../img/icon1.png" class="icon" />
                <div>
                  <div style="color: #ccc; font-size: 12px; margin-top: 10px">在用装备数（台）</div>
-                  <div style="font-size: 16px; font-weight: 800">{{ equipNum }}</div>
+                  <div style="font-size: 16px; font-weight: 800">{{ 37746 }}</div>
                </div>
              </div>
            </el-col>
@ -54,7 +54,7 @@
            <th>工程名称</th>
            <th>在用装备数（台）</th>
            <th>规模（拆单公里）</th>
-            <th>百公里线路装备使用情况</th>
+            <!-- <th>百公里线路装备使用情况</th> -->
          </tr>
        </thead>

@ -65,7 +65,7 @@
            <td style="width: 200px">{{ row.projectName }}</td>
            <td style="width: 120px">{{ row.inUser }}</td>
            <td>{{ row.scale }}</td>
-            <td>{{ row.usage }}</td>
+            <!-- <td>{{ row.usage }}</td> -->
          </tr>
        </tbody>
      </table>
@ -85,12 +85,38 @@ export default {
      proNum: 0,
      equipNum: 0,
      tabIndex: 0,
-      tableData: [],
+      tableData: [
+        {
+          projectName: '埇桥-萧砀|回500千伏线路工程',
+          inUser: '82',
+          scale: '172',
+        },
+        {
+          projectName: '石岗-施桥110kV线路工程',
+          inUser: '18',
+          scale: '55.6',
+        },
+        {
+          projectName: '换流站-金牛500kV线路工程',
+          inUser: '18',
+          scale: '55.6',
+        },
+        {
+          projectName: '汤庄-平圩500kV线路工程',
+          inUser: '18',
+          scale: '55.6',
+        },
+        {
+          projectName: '魏武-木兰n入祝集变电站220kV线路工程',
+          inUser: '18',
+          scale: '55.6',
+        },
+      ],
    }
  },
  created() {
-    this.getProList()
-    this.getList()
+    // this.getProList()
+    // this.getList()
  },
  methods: {
    changTab(type) {
@ -101,7 +127,7 @@ export default {
      try {
        const params = {
          type: this.tabIndex,
-          proCode: this.proCode
+          proCode: this.proCode,
        }
        const res = await getEquipmentUseApi(params)
        this.tableData = res.data.equipmentUse || []
@ -241,7 +267,10 @@ td {
  padding: 10px;
  text-align: center;
  white-space: nowrap;
-  border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整
+  /* border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整 */
+  background: linear-gradient(to bottom, #f0f5f8, #5eb6f0);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
 }

 th {
--- a/src/views/screen/gwScreen/components/right/UsageRateSituationList.vue
+++ b/src/views/screen/gwScreen/components/right/UsageRateSituationList.vue
@ -1,8 +1,8 @@
 <template>
  <div class="table-style">
    <div class="title-tip">
-      <div>各单位装备在用率情况</div>
-      <div class="more" @click="openDialog">更多 ></div>
+      <div>各网省装备在用率情况</div>
+      <div class="more" @click="">更多 ></div>
    </div>

    <div class="table-list scroll-container">
@ -38,11 +38,37 @@ import { getDeptEquipmentApi } from '@/api/wsScreen'
 export default {
  data() {
    return {
-      tableData: [],
+      tableData: [
+        {
+          name: '安徽省',
+          proportion: '61.55',
+          turnoverRate: '2.55',
+        },
+        {
+          name: '山西',
+          proportion: '48.25',
+          turnoverRate: '2.34',
+        },
+        {
+          name: '河北',
+          proportion: '42.36',
+          turnoverRate: '2.23',
+        },
+        {
+          name: '江苏',
+          proportion: '39.56',
+          turnoverRate: '1,91',
+        },
+        {
+          name: '山东',
+          proportion: '36.05',
+          turnoverRate: '1.81',
+        },
+      ],
    }
  },
  created() {
-    this.getList()
+    // this.getList()
  },
  methods: {
    async getList() {
@ -100,7 +126,11 @@ td {
  padding: 10px;
  text-align: center;
  white-space: nowrap;
-  border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整
+  /* border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整 */
+  background: linear-gradient(to bottom, #f0f5f8, #5eb6f0);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+  line-height: 22px;
 }

 th {
@ -132,13 +162,13 @@ tbody tr:hover {
  overflow: auto;

  /* 隐藏滚动条轨迹 */
-  -ms-overflow-style: none;  /* IE / Edge */
-  scrollbar-width: none;     /* Firefox */
+  -ms-overflow-style: none; /* IE / Edge */
+  scrollbar-width: none; /* Firefox */
 }

 /* Chrome / Safari */
 .scroll-container::-webkit-scrollbar {
-  width: 0;   /* 或者直接隐藏 */
+  width: 0; /* 或者直接隐藏 */
  height: 0;
  background: transparent; /* 背景透明 */
 }
--- a/src/views/screen/gwScreen/components/right/index.vue
+++ b/src/views/screen/gwScreen/components/right/index.vue
@ -8,31 +8,31 @@
      <div class="equipment-list">
        <div class="equip-item1 item">
          <div class="title">年度总投资额</div>
-          <div class="number">{{ annualTotal ? (annualTotal / 100000000).toFixed(4) : 0 }} <span class="unit">亿元</span></div>
+          <div class="number">{{ 2600 }} <span class="unit">亿元</span></div>
        </div>
        <div class="equip-item2 item">
          <div class="title">在建工程数</div>
-          <div class="number">{{ projectNUm }} <span class="unit">个</span></div>
+          <div class="number">{{ 19467 }} <span class="unit">个</span></div>
        </div>
        <div class="equip-item3 item">
          <div class="title">在用装备数</div>
-          <div class="number">{{ num }} <span class="unit">台</span></div>
+          <div class="number">{{ 45036 }} <span class="unit">台</span></div>
        </div>
      </div>
      <div class="top-bottom">
        <div class="usage-rate">
-          <div class="usage-rate-item" @click="openDialogEquip(1)">
+          <div class="usage-rate-item" @click="">
            <img src="../../img/usage-rate.png" alt="" />
            <div style="margin: 0 10px">在用率</div>
            <div style="width: 250px">
-              <SegmentProgress :value="proportion" :total="20" />
+              <SegmentProgress :value="51" :total="20" />
            </div>
          </div>
        </div>
        <div class="turnround-rate">
-          <div class="turnround-rate-title" @click="openDialogEquip(2)">
+          <div class="turnround-rate-title" @click="">
            <span style="color: #ccc; font-size: 15px">周转率 </span>
-            {{ turnoverRate }}
+            {{ 2.41 }}
            <span class="unit"> 次/年</span></div
          >
        </div>
@ -42,12 +42,12 @@
      <el-row :gutter="20">
        <el-col :span="10" :offset="0">
          <div class="usage-rate-situation">
-            <UsageRateSituationList @openDialog="openDialog" />
+            <UsageRateSituationList />
          </div>
        </el-col>
        <el-col :span="14" :offset="0">
          <div class="usage-rate-pro">
-            <ProEquipSituationList @openDialog="openDialogPro" />
+            <ProEquipSituationList />
          </div>
        </el-col>
      </el-row>
@ -96,7 +96,7 @@ export default {
    }
  },
  created() {
-    this.getInfo()
+    // this.getInfo()
  },
  methods: {
    async getInfo() {
--- a/src/views/screen/wsScreen/components/left/EquipItem.vue
+++ b/src/views/screen/wsScreen/components/left/EquipItem.vue
@ -2,13 +2,13 @@
  <div>
    <div class="title" @click="openDialog">{{ title }}</div>
    <div class="content">
-      <div>
+      <div class="left-wrap">
        <div class="left-item">
-          <div class="left-tip">装备数 <span>（台）</span></div>
+          <div class="left-tip">装备数 <span>(台)</span></div>
          <div class="number">{{ query.num || 0 }}</div>
        </div>
        <div class="left-item">
-          <div class="left-tip">装备价值 <span>（亿元）</span></div>
+          <div class="left-tip">装备价值 <span>(亿元)</span></div>
          <div class="number">{{ query.price ? (query.price / 100000000).toFixed(4) : 0 }}</div>
        </div>
      </div>
@ -82,7 +82,7 @@ export default {
          {
            name: '装备年限',
            type: 'pie',
-            radius: '39%',
+            radius: '55%',
            avoidLabelOverlap: false,
            label: {
              show: true,
@ -91,8 +91,8 @@ export default {
            },
            labelLine: {
              show: true,
-              length: 8, // 第一段线
-              length2: 5, // 第二段线
+              length: 5, // 第一段线
+              length2: 3, // 第二段线
            },

            data: this.pieData,
@ -126,10 +126,15 @@ export default {
  -webkit-text-fill-color: transparent;
 }
 .content {
-  display: flex;
+  /* display: flex; */
+  .left-wrap {
+    display: flex;
+    justify-content: space-between;
+  }
  .left-item {
-    margin-top: 16px;
-    height: 90px;
+    width: 48%;
+    margin-top: 6px;
+    height: 65px;
    text-align: center;
    background-image: url('../../img/equip-item.png');
    background-size: 100% 100%;
@ -137,26 +142,26 @@ export default {
    .left-tip {
      padding-top: 6px;
      padding-bottom: 15px;
-      font-size: 11px;
+      font-size: 10px;
      font-weight: 600;
-      width: 50px;
+      /* width: 50px; */
    }
  }

  .right-tip {
-    margin-left: 10px;
-    margin-top: 16px;
+    /* margin-left: 10px; */
+    margin-top: 6px;
    padding: 4px 0;
    font-size: 11px;
    font-weight: 600;
-    width: 100px;
+    width: 100%;
    text-align: center;
    background-image: url('../../img/equip-title.png');
    background-size: 100% 100%;
  }
  .pie-chart {
-    width: 120px;
-    height: 120px;
+    width: 140px;
+    height:100px;
  }
 }
 </style>
--- a/src/views/screen/wsScreen/components/left/EquipStatus.vue
+++ b/src/views/screen/wsScreen/components/left/EquipStatus.vue
@ -50,9 +50,9 @@ export default {

      const option = {
        grid: {
-          left: '22%',
-          right: '10%',
-          top: '20%',
+          left: '16%',
+          right: '6%',
+          top: '16%',
          bottom: '15%',
        },
        xAxis: {
@ -141,7 +141,7 @@ export default {
 <style lang="scss" scoped>
 .chart-container {
  width: 100%; /* 宽度 */
-  height: 300px; /* 高度 */
+  height: 230px; /* 高度 */
  margin: 0 auto;
 }
 </style>
--- a/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue
+++ b/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue
@ -85,10 +85,10 @@ table {

 th,
 td {
-  padding: 10px;
+  padding: 9px 3px;
  text-align: center;
  white-space: nowrap;
-  border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整
+  /* border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整 */
 }

 th {
--- a/src/views/screen/wsScreen/components/left/index.vue
+++ b/src/views/screen/wsScreen/components/left/index.vue
@ -1,6 +1,5 @@
 <template>
  <div>
-
    <div class="left-warp">
      <div class="top-box">
        <div class="title-tip">
@ -34,44 +33,32 @@
        </el-row>
      </div>
      <div class="bottom-box">
-        <el-row :gutter="20">
-          <el-col :span="13" :offset="0">
-            <div class="bottom-left">
-              <div class="title-tip">
-                <div class="tip-title">单位装备配置</div>
-                <div class="more" @click="openEquipConfig">更多 ></div>
-              </div>
-              <div class="bottom-list">
-                <UnitEquipmentConfig />
-              </div>
-            </div>
-            <div class="bottom-explain" @click="openRemarkMore">
-              <div>备注说明：</div>
-              <div>
-                <div>施工装备配置率=∑ⁿ¹专用装备实际配置率+∑ⁿ¹新型装备实际配置率 </div>
-                <div>装备实际配置率=实际装配配置数量÷基本配置标准数量×装备赋值×配置折算率 </div>
-                <div>专用装备满分80分，创新装备满分20分，满分100分</div>
-              </div>
-            </div>
-          </el-col>
-          <el-col :span="11" :offset="0">
-            <div class="bottom-right">
-              <div class="title-tip">
-                <div class="tip-title">装备状态</div>
-                <div class="more" @click="openStatusMore">更多 ></div>
-              </div>
-              <div class="equip-status">
-                <EquipStatus />
-              </div>
-            </div>
-            <div class="bottom-explain">
-              <div>备注说明：再用装备包含于共享装备。</div>
-            </div>
-          </el-col>
-        </el-row>
+        <div class="bottom-left">
+          <div class="title-tip">
+            <div class="tip-title">单位装备配置</div>
+            <div class="more" @click="openEquipConfig">更多 ></div>
+          </div>
+          <div class="bottom-list">
+            <UnitEquipmentConfig />
+          </div>
+        </div>
+      </div>
+      <div class="bottom-box">
+        <div class="bottom-right">
+          <div class="title-tip">
+            <div class="tip-title">装备状态</div>
+            <div class="more" @click="openStatusMore">更多 ></div>
+          </div>
+          <div class="equip-status">
+            <EquipStatus />
+          </div>
+          <div class="bottom-explain">
+            <div>备注说明：再用装备包含于共享装备。</div>
+          </div>
+        </div>
      </div>
    </div>
-  
+
    <!-- 全量装备 -->
    <AllEquip ref="allEquip" />
    <!-- 单位装备配置 -->
@ -168,27 +155,6 @@ export default {
            this.list3[2] = item.ten
          }
        })
-        // this.state1.num = data.line.num || 0
-        // this.state1.price = data.line.price || 0
-        // this.state2.num = data.cable.num || 0
-        // this.state2.price = data.cable.price || 0
-        // this.state3.num = data.substation.num || 0
-        // this.state3.price = data.substation.price || 0
-        // this.list1[0] = data.line.five
-        // this.list1[1] = data.line.fiveOrTen
-        // this.list1[2] = data.line.ten
-        // this.list2[0] = data.cable.five
-        // this.list2[1] = data.cable.fiveOrTen
-        // this.list2[2] = data.cable.ten
-        // this.list3[0] = data.substation.five
-        // this.list3[1] = data.substation.fiveOrTen
-        // this.list3[2] = data.substation.ten
-        // console.log('🚀 ~ getEquipList ~ this.list1:', this.list1)
-        // console.log('🚀 ~ getEquipList ~ this.list2:', this.list2)
-        // console.log('🚀 ~ getEquipList ~ this.list3:', this.list3)
-        // console.log('🚀 ~ getEquipList ~ this.state1:', this.state1)
-        // console.log('🚀 ~ getEquipList ~ this.state2:', this.state2)
-        // console.log('🚀 ~ getEquipList ~ this.state3:', this.state3)
      } catch (error) {
        console.log('🚀 ~ getEquipList ~ error:', error)
      }
@ -220,7 +186,7 @@ export default {

 <style lang="scss" scoped>
 .left-warp {
-  height: calc(100vh - 79px);
+  height: calc(100vh - 100px);
  display: flex;
  flex-direction: column;
  justify-content: space-between;
@ -244,15 +210,15 @@ export default {
  }
  .top-box {
    /* height: 350px; */
-    height: 21%;
+    height: 18%;
    background-image: url('../../img/equipmentOverview.png');
    background-size: 100% 100%;

    .equip-box {
      padding-left: 20px;
-      margin-top: 20px;
-      margin-bottom: 13px;
-      height: 120px;
+      /* margin-top: 20px; */
+      /* margin-bottom: 13px; */
+      height: 100px;
      background-image: url('../../img/equipmentOverviewData.png');
      background-size: 100% 100%;
      /* position: relative; */
@ -283,36 +249,35 @@ export default {
        cursor: pointer;
      }
    }
-
  }
  .item-box {
    padding: 0 20px;
  }
  .bottom-box {
-    height: 49%;
    .bottom-explain {
      margin-top: 15px;
      color: #97aad6;
      font-size: 12px;
      display: flex;
+      justify-content: center;
      cursor: pointer;
    }
    .bottom-tip {
    }
    .bottom-left {
-      /* height: 260px; */
+      height: 210px;
      background-image: url('../../img/unit-equip.png');
-      background-size: cover;
+      background-size: 100% 100%;
      .bottom-list {
-        margin-top: 20px;
-        height: 250px;
+        margin: 5px 0 10px;
+        height: 165px;
        overflow: auto;
      }
    }
    .bottom-right {
      /* height: 250px; */
      background-image: url('../../img/equip-status.png');
-      background-size: cover;
+      background-size: 100% 100%;
    }
  }
 }
--- a/src/views/screen/wsScreen/components/right/EquipUsageRate.vue
+++ b/src/views/screen/wsScreen/components/right/EquipUsageRate.vue
@ -13,11 +13,11 @@

    <div class="item-list">
      <div class="item" :class="`item-bg-${index + 1}`" v-for="(item, index) in tableList" :key="index">
-        <div style="text-align: center; margin-top: 15px; font-size: 10px;">{{ item.name || '-' }}</div>
-        <div style="margin: 115px 0 0 19px"
+        <div style="text-align: center; margin-top: 25px; font-size: 10px;">{{ item.name || '-' }}</div>
+        <div style="margin: 90px 0 0 40px"
          ><span style="color: #ccc">在用率</span> {{ item.proportion || 0 }} %</div
        >
-        <div style="margin-left: 19px"
+        <div style="margin-left: 40px"
          ><span style="color: #ccc">周转率</span> {{ item.turnoverRate || 0 }} 次/年</div
        >
      </div>
@ -63,8 +63,8 @@ export default {
        }
        const res = await getUsageStatisticsApi({ type })
        if (!res.data) return
-        if (res.data.length > 5) {
-          this.tableList = res.data.slice(0, 5)
+        if (res.data.length > 3) {
+          this.tableList = res.data.slice(0, 3)
        } else {
          this.tableList = res.data
        }
@ -160,11 +160,12 @@ export default {
  padding: 10px 0;
  display: flex;
  align-items: center;
-  /* justify-content: space-between; */
+  justify-content: space-between;
  width: 100%;
+  height: 200px;
  .item {
-    width: 25%;
-    height: 200px;
+    width: 30%;
+    height: 180px;
    font-weight: bolder;
    margin-right: 10px;
    font-size: 10px;
--- a/src/views/screen/wsScreen/components/right/ProEquipSituationList.vue
+++ b/src/views/screen/wsScreen/components/right/ProEquipSituationList.vue
@ -13,7 +13,7 @@
            @change="getList"
            style="width: 80px"
          >
-            <el-option v-for="item in options" :key="item.proCode" :label="item.proName" :value="item.proCode" />
+            <el-option v-for="(item, index) in options" :key="index" :label="item.proName" :value="item.proCode" />
          </el-select>
        </div>
        <div style="margin-left: 15px" @click="openDialog">更多 ></div>
@ -134,10 +134,13 @@ export default {

 <style lang="scss" scoped>
 .table-style {
-  /* height: 350px; */
+  margin-bottom: 10px;
+  height: 219px;
+  overflow: hidden;
 }
 .scroll-container {
  width: 100%;
+  height: 219px;
  overflow: auto;

  /* 隐藏滚动条轨迹 */
@ -152,11 +155,11 @@ export default {
  background: transparent; /* 背景透明 */
 }
 .title-tip {
-  font-size: 12px;
+  font-size: 15px;
  display: flex;
  justify-content: space-between;
-  padding-top: 10px;
-  padding-left: 25px;
+  padding-top: 2px;
+  padding-left: 40px;
  font-family: DS-TITLE;
  .title-text {
    background: linear-gradient(to bottom, #f0f5f8, #5eb6f0);
@ -260,7 +263,7 @@ td {
  padding: 10px;
  text-align: center;
  white-space: nowrap;
-  border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整
+  /* border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整 */
 }

 th {
--- a/src/views/screen/wsScreen/components/right/UsageRateSituationList.vue
+++ b/src/views/screen/wsScreen/components/right/UsageRateSituationList.vue
@ -66,11 +66,11 @@ export default {
  /* height: 350px; */
 }
 .title-tip {
-  font-size: 12px;
+  font-size: 15px;
  display: flex;
  justify-content: space-between;
-  padding-top: 10px;
-  padding-left: 20px;
+  padding-top: 2px;
+  padding-left: 40px;
  font-family: DS-TITLE;
  background: linear-gradient(to bottom, #f0f5f8, #5eb6f0);
  -webkit-background-clip: text;
@ -86,9 +86,9 @@ export default {
  }
 }
 .table-list {
-  margin-top: 20px;
-  /* height: 280px; */
-  height: 31vh;
+  margin: 3px 0 10px;
+  height: 145px;
+  /* height: 31vh; */
  overflow: auto;
 }
 table {
@ -103,7 +103,7 @@ td {
  padding: 10px;
  text-align: center;
  white-space: nowrap;
-  border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整
+  /* border: 1px solid rgba(255, 255, 255, 0.3); // 边框颜色可根据背景调整 */
 }

 th {
--- a/src/views/screen/wsScreen/components/right/index.vue
+++ b/src/views/screen/wsScreen/components/right/index.vue
@ -9,7 +9,9 @@
        <div class="equipment-list">
          <div class="equip-item1 item">
            <div class="title">年度总投资额</div>
-            <div class="number">{{ annualTotal ? (annualTotal / 100000000).toFixed(4) : 0 }} <span class="unit">亿元</span></div>
+            <div class="number"
+              >{{ annualTotal ? (annualTotal / 100000000).toFixed(4) : 0 }} <span class="unit">亿元</span></div
+            >
          </div>
          <div class="equip-item2 item">
            <div class="title">在建工程数</div>
@ -24,7 +26,7 @@
          <div class="usage-rate">
            <div class="usage-rate-item" @click="openDialogEquip(1)">
              <img src="../../img/usage-rate.png" alt="" />
-              <div style="margin: 0 6px; font-size: 14px; width: 42px;">在用率</div>
+              <div style="margin: 0 6px; font-size: 14px; width: 42px">在用率</div>
              <div style="width: 180px">
                <SegmentProgress :value="proportion" :total="13" />
              </div>
@ -39,19 +41,11 @@
          </div>
        </div>
      </div>
-      <div class="center-box">
-        <el-row :gutter="20">
-          <el-col :span="10" :offset="0">
-            <div class="usage-rate-situation">
-              <UsageRateSituationList @openDialog="openDialog" />
-            </div>
-          </el-col>
-          <el-col :span="14" :offset="0">
-            <div class="usage-rate-pro">
-              <ProEquipSituationList @openDialog="openDialogPro" />
-            </div>
-          </el-col>
-        </el-row>
+      <div class="usage-rate-situation">
+        <UsageRateSituationList @openDialog="openDialog" />
+      </div>
+      <div class="usage-rate-pro">
+        <ProEquipSituationList @openDialog="openDialogPro" />
      </div>
      <div class="bottom-box">
        <EquipUsageRate />
@ -160,20 +154,20 @@ export default {
  .center-box {
    /* height: 350px; */
    /* flex-grow: 1; */
-    .usage-rate-situation {
-      width: 100%;
-      height: 100%;
-      /* height: 350px; */
-      background-image: url('../../img/equip-usage.png');
-      background-size: 100% 100%;
-    }
-    .usage-rate-pro {
-      width: 100%;
-      height: 100%;
-      /* height: 350px; */
-      background-image: url('../../img/equip-usage.png');
-      background-size: 100% 100%;
-    }
+  }
+  .usage-rate-situation {
+    width: 100%;
+    /* height: 100%; */
+    /* height: 350px; */
+    background-image: url('../../img/equip-usage.png');
+    background-size: 100% 100%;
+  }
+  .usage-rate-pro {
+    width: 100%;
+    /* height: 100%; */
+    /* height: 350px; */
+    background-image: url('../../img/equip-usage.png');
+    background-size: 100% 100%;
  }
  .bottom-box {
    /* height: 310px; */
--- a/src/views/screen/wsScreen/index.vue
+++ b/src/views/screen/wsScreen/index.vue
@ -40,8 +40,8 @@ export default {
 }
 #index {
  color: #d3d6dd;
-  width: 100vw;
-  height: 100vh;
+  width: 100%;
+  height: 100%;
  /* width: 1920px;
  height: 1080px; */
  /* position: absolute; */