diff --git a/src/views/home/components/BarChart.vue b/src/views/home/components/BarChart.vue
new file mode 100644
index 00000000..a264e633
--- /dev/null
+++ b/src/views/home/components/BarChart.vue
@@ -0,0 +1,129 @@
+<template>
+  <div>
+    <div ref="barRef" style="width: 100%; height: calc(38vh - 36px)"></div>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+
+export default {
+  props: {
+    data: {
+      type: Array,
+      default: () => [],
+    },
+    labels: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      chart: null,
+    }
+  },
+  mounted() {
+    console.log('🚀 ~ mounted-柱状图:')
+    this.$nextTick(() => {
+      this.initBarChart()
+      window.addEventListener('resize', this.resizeChart)
+    })
+  },
+  watch: {
+    data: {
+      deep: true,
+      handler() {
+        this.updateChart()
+      },
+    },
+    labels() {
+      this.updateChart()
+    },
+  },
+  beforeUnmount() {
+    window.removeEventListener('resize', this.resizeChart)
+    this.chart && this.chart.dispose()
+  },
+  methods: {
+    initBarChart() {
+      this.chart = echarts.init(this.$refs.barRef)
+
+      const option = {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow',
+          },
+          formatter: (params) => {
+            const item = params[0]
+            return `${item.name}<br/>数量：<b>${item.value}</b>`
+          },
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true,
+        },
+        xAxis: {
+          type: 'category',
+          data: this.labels,
+          axisLabel: {
+            interval: 0, // 强制显示所有标签
+            formatter(value) {
+              const max = 5
+              if (!value) return ''
+              if (value.length <= max) return value
+
+              let result = ''
+              for (let i = 0; i < value.length; i += max) {
+                result += value.slice(i, i + max) + '\n'
+              }
+              return result
+            },
+          },
+        },
+        yAxis: {
+          type: 'value',
+        },
+        series: [
+          {
+            name: '数据',
+            type: 'bar',
+            barWidth: 35,
+            data: this.data,
+            itemStyle: {
+              color: (params) => {
+                const colors = ['#5470C6', '#3BA272', '#FAC858', '#EE6666', '#73C0DE', '#91CC75']
+                return colors[params.dataIndex % colors.length]
+              },
+            },
+          },
+        ],
+      }
+
+      this.chart.setOption(option)
+    },
+    updateChart() {
+      if (!this.chart) return
+
+      this.chart.setOption({
+        xAxis: {
+          data: this.labels,
+        },
+        series: [
+          {
+            data: this.data,
+          },
+        ],
+      })
+    },
+    resizeChart() {
+      this.chart && this.chart.resize()
+    },
+  },
+}
+</script>
+
+<style scoped></style>
diff --git a/src/views/home/components/MunicipalCompany.vue b/src/views/home/components/MunicipalCompany.vue
index 2b8733db..9397fa94 100644
--- a/src/views/home/components/MunicipalCompany.vue
+++ b/src/views/home/components/MunicipalCompany.vue
@@ -65,7 +65,13 @@
             <span>待办</span>
           </div>
           <!-- 滚动列表 -->
-          <div class="scroll-wrapper" :class="{ 'is-hover': isHover}" ref="wrap" @mouseenter="pause" @mouseleave="resume">
+          <div
+            class="scroll-wrapper"
+            :class="{ 'is-hover': isHover }"
+            ref="wrap"
+            @mouseenter="pause"
+            @mouseleave="resume"
+          >
             <ul class="scroll-list" ref="list">
               <li v-for="(item, index) in eventList" :key="item.id" :class="{ odd: index % 2 === 1 }">
                 <div
@@ -93,48 +99,60 @@
         <el-card class="card-box">
           <div class="title-tip">
             <i class="el-icon-copy-document icon-tip" />
-            <span>当月出库数量</span>
+            <span @click="isBusinessBar = !isBusinessBar" style="cursor: pointer">当月出入库</span>
           </div>
-          <div class="content">
+          <div class="content" v-if="!isBusinessBar">
             <div class="content-item content-item2">
               <div class="item-box">
-                <div class="num2">{{ numData.selfUseApplyNum }}</div>
-                <div>自用申请数</div>
+                <div class="num2">{{ dataAll.selfUseApplyNum || 0 }}</div>
+                <div>出库总数</div>
               </div>
             </div>
             <div class="content-item content-item2">
               <div class="item-box">
-                <div class="num2">{{ numData.selfUseAuditNum }}</div>
-                <div>自用装备数</div>
+                <div class="num2">{{ dataAll.selfUseOutNum || 0 }}</div>
+                <div>装备出库</div>
               </div>
             </div>
             <div class="content-item content-item2">
               <div class="item-box">
-                <div class="num2">{{ numData.selfUseOutNum }}</div>
-                <div>自用工具数</div>
+                <div class="num2">{{ dataAll.selfUseAuditNum || 0 }}</div>
+                <div>工具出库</div>
               </div>
             </div>
           </div>
-          <div class="content">
+          <div class="content" v-if="!isBusinessBar">
             <div class="content-item content-item2">
               <div class="item-box">
-                <div class="num2">{{ shareData.buyerNum }}</div>
-                <div>共享订单数</div>
+                <div class="num2">{{ dataAll.returnApplyNum || 0 }}</div>
+                <div>退库总数</div>
               </div>
             </div>
             <div class="content-item content-item2">
               <div class="item-box">
-                <div class="num2">{{ shareData.sellerNum }}</div>
-                <div>共享装备数</div>
+                <div class="num2">{{ dataAll.returnAuditApplyNum || 0 }}</div>
+                <div>装备退库</div>
               </div>
             </div>
             <div class="content-item content-item2">
               <div class="item-box">
-                <div class="num2">{{ shareData.toolNum }}</div>
-                <div>共享工具数</div>
+                <div class="num2">{{ dataAll.returnAuditRepairNum || 0 }}</div>
+                <div>工具退库</div>
               </div>
             </div>
           </div>
+          <BarChart
+            v-if="isBusinessBar"
+            :labels="['出库总数', '装备出库', '工具出库', '退库总数', '装备退库', '工具退库']"
+            :data="[
+              dataAll.selfUseApplyNum || 0,
+              dataAll.selfUseOutNum || 0,
+              dataAll.selfUseAuditNum || 0,
+              dataAll.returnApplyNum || 0,
+              dataAll.returnAuditApplyNum || 0,
+              dataAll.returnAuditRepairNum || 0,
+            ]"
+          />
         </el-card>
       </div>
 
@@ -142,36 +160,60 @@
         <el-card class="card-box">
           <div class="title-tip">
             <i class="el-icon-set-up icon-tip" />
-            <span>当月退库数量</span>
+            <span @click="isShareBar = !isShareBar" style="cursor: pointer">当月共享</span>
           </div>
-          <div class="content">
+          <div class="content" v-if="!isShareBar">
             <div class="content-item content-item2">
               <div class="item-box">
-                <div class="num2">{{ numData.returnApplyNum }}</div>
-                <div>退库申请数</div>
+                <div class="num2">{{ shareData.sellerNum || 0 }}</div>
+                <div>出租订单</div>
               </div>
             </div>
             <div class="content-item content-item2">
               <div class="item-box">
-                <div class="num2">{{ numData.returnAuditApplyNum }}</div>
-                <div>退库审核数</div>
+                <div class="num2">{{ shareData.sellerMaNum || 0 }}</div>
+                <div>出租装备</div>
+              </div>
+            </div>
+            <div class="content-item content-item2">
+              <div class="item-box">
+                <div class="num2">{{ shareData.sellerToolNum || 0 }}</div>
+                <div>出租工具</div>
               </div>
             </div>
           </div>
-          <div class="content">
+          <div class="content" v-if="!isShareBar">
             <div class="content-item content-item2">
               <div class="item-box">
-                <div class="num2">{{ numData.returnAuditStoreNum }}</div>
-                <div>退库入库数</div>
+                <div class="num2">{{ shareData.buyerNum || 0 }}</div>
+                <div>租赁订单</div>
               </div>
             </div>
             <div class="content-item content-item2">
               <div class="item-box">
-                <div class="num2">{{ numData.returnAuditRepairNum }}</div>
-                <div>退库维修数</div>
+                <div class="num2">{{ shareData.buyerMaNum || 0 }}</div>
+                <div>租赁装备</div>
+              </div>
+            </div>
+            <div class="content-item content-item2">
+              <div class="item-box">
+                <div class="num2">{{ shareData.buyerToolNum || 0 }}</div>
+                <div>租赁工具</div>
               </div>
             </div>
           </div>
+          <BarChart
+            v-if="isShareBar"
+            :labels="['出租订单', '出租装备', '出租工具', '租赁订单', '租赁装备', '租赁工具']"
+            :data="[
+              shareData.sellerNum || 0,
+              shareData.sellerMaNum || 0,
+              shareData.sellerToolNum || 0,
+              shareData.buyerNum || 0,
+              shareData.buyerMaNum || 0,
+              shareData.buyerToolNum || 0,
+            ]"
+          />
         </el-card>
       </div>
 
@@ -179,31 +221,36 @@
         <el-card class="card-box">
           <div class="title-tip">
             <i class="el-icon-setting icon-tip" />
-            <span>当月维修数量</span>
+            <span @click="isManageBar = !isManageBar" style="cursor: pointer">当月管理</span>
           </div>
-          <div class="content">
+          <div class="content" v-if="!isManageBar">
             <div class="content-item content-item2">
               <div class="item-box">
-                <div class="num2">{{ numData.repairPendingNum }}</div>
-                <div>待维修数</div>
+                <div class="num2">{{ dataAll.warehousingNum || 0 }}</div>
+                <div>当月入库</div>
               </div>
             </div>
             <div class="content-item content-item2">
               <div class="item-box">
-                <div class="num2">{{ numData.repairQualifiedNum }}</div>
-                <div>维修合格数</div>
+                <div class="num2">{{ dataAll.repairQualifiedNum || 0 }}</div>
+                <div>当月维修</div>
               </div>
             </div>
           </div>
-          <div class="content">
+          <div class="content" v-if="!isManageBar">
             <div class="content-item3" style="width: 48%">
               <div class="item-box">
-                <div class="num2">{{ numData.repairRetireNum }}</div>
-                <div>维修退役数</div>
+                <div class="num2">{{ dataAll.repairRetireNum || 0 }}</div>
+                <div>当月退役</div>
               </div>
             </div>
             <!-- <div class="" style="flex: 1"> </div> -->
           </div>
+          <BarChart
+            v-if="isManageBar"
+            :labels="['当月入库', '当月维修', '当月退役']"
+            :data="[dataAll.warehousingNum || 0, dataAll.repairQualifiedNum || 0, dataAll.repairRetireNum || 0]"
+          />
         </el-card>
       </div>
     </div>
@@ -213,9 +260,11 @@
 <script>
 import * as echarts from 'echarts'
 import { getDeviceNumAll, getDeviceNumByMonth, getMaQc, getApprover, getShare } from '@/api/basic/home'
+import BarChart from './BarChart.vue'
 
 export default {
   name: 'MunicipalCompany',
+  components: { BarChart },
   data() {
     return {
       isLoading: false,
@@ -241,6 +290,9 @@ export default {
         repairQualifiedNum: 0, // 维修合格数
         repairRetireNum: 0, // 维修合格数
       },
+      isBusinessBar: false,
+      isShareBar: false,
+      isManageBar: false,
     }
   },
   mounted() {
diff --git a/src/views/screen/cityScreen-old/components/equiQuantity/index.vue b/src/views/screen/cityScreen-old/components/equiQuantity/index.vue
index 1370b2db..7a1d9975 100644
--- a/src/views/screen/cityScreen-old/components/equiQuantity/index.vue
+++ b/src/views/screen/cityScreen-old/components/equiQuantity/index.vue
@@ -21,9 +21,9 @@
                             <span class="unit">台</span>
                         </div>
                         <div class="num">
-                            <span style="font-weight: 700;" v-if="lineData.totalValue>99999999">{{(lineData.totalValue/100000000).toFixed(3)}}</span>
-                            <span style="font-weight: 700;" v-else>{{(lineData.totalValue/10000).toFixed(2)}}</span>
-                            <span class="unit" v-if="lineData.totalValue>99999999">亿元</span> 
+                            <span style="font-weight: 700;" v-if="lineData.totalValue>99999999">{{lineData.totalValue}}</span>
+                            <span style="font-weight: 700;" v-else>{{lineData.totalValue}}</span>
+                            <span class="unit" v-if="lineData.totalValue>99999999">万元</span> 
                             <span class="unit" v-else>万元</span> 
                         </div>
                     </div>
@@ -61,9 +61,9 @@
                             <span class="unit">台</span>
                         </div>
                         <div class="num">
-                            <span style="font-weight: 700;" v-if="bdData.totalValue>99999999">{{(bdData.totalValue/100000000).toFixed(3)}}</span>
-                            <span style="font-weight: 700;" v-else>{{(bdData.totalValue/10000).toFixed(2)}}</span>
-                            <span class="unit" v-if="bdData.totalValue>99999999">亿元</span> 
+                            <span style="font-weight: 700;" v-if="bdData.totalValue>99999999">{{bdData.totalValue}}</span>
+                            <span style="font-weight: 700;" v-else>{{bdData.totalValue}}</span>
+                            <span class="unit" v-if="bdData.totalValue>99999999">万元</span> 
                             <span class="unit" v-else>万元</span> 
                         </div>
                     </div>
@@ -101,9 +101,9 @@
                             <span class="unit">台</span>
                         </div>
                         <div class="num">
-                            <span style="font-weight: 700;" v-if="dlData.totalValue>99999999">{{(dlData.totalValue/100000000).toFixed(3)}}</span>
-                            <span style="font-weight: 700;" v-else>{{(dlData.totalValue/10000).toFixed(2)}}</span>
-                            <span class="unit" v-if="dlData.totalValue>99999999">亿元</span> 
+                            <span style="font-weight: 700;" v-if="dlData.totalValue>99999999">{{dlData.totalValue}}</span>
+                            <span style="font-weight: 700;" v-else>{{dlData.totalValue}}</span>
+                            <span class="unit" v-if="dlData.totalValue>99999999">万元</span> 
                             <span class="unit" v-else>万元</span> 
                         </div>
                     </div>
diff --git a/src/views/screen/cityScreen-old/components/topIcons/index.vue b/src/views/screen/cityScreen-old/components/topIcons/index.vue
index 27c4dfca..3fee968f 100644
--- a/src/views/screen/cityScreen-old/components/topIcons/index.vue
+++ b/src/views/screen/cityScreen-old/components/topIcons/index.vue
@@ -14,9 +14,9 @@
             <div class="item-box" style="right: -10%;">
                 <div class="title">装备总价值</div>
                 <div class="num">
-                    <span style="font-weight: 600;" v-if="totalValue>99999999">{{(totalValue/100000000).toFixed(3)}}</span>
-                    <span style="font-weight: 600;" v-else>{{(totalValue/10000).toFixed(2)}}</span>
-                    <span class="unit" v-if="totalValue>99999999">亿元</span> 
+                    <span style="font-weight: 600;" v-if="totalValue>99999999">{{totalValue}}</span>
+                    <span style="font-weight: 600;" v-else>{{totalValue}}</span>
+                    <span class="unit" v-if="totalValue>99999999">万元</span> 
                     <span class="unit" v-else>万元</span>
                 </div>
             </div>
diff --git a/src/views/screen/cityScreen/components/equQuantity/index.vue b/src/views/screen/cityScreen/components/equQuantity/index.vue
index 3d7cd230..15dcb329 100644
--- a/src/views/screen/cityScreen/components/equQuantity/index.vue
+++ b/src/views/screen/cityScreen/components/equQuantity/index.vue
@@ -13,10 +13,10 @@
             </div>
             <div class="num">
                             <span style="font-weight: 700" v-if="lineData.totalValue > 99999999">{{
-                                (lineData.totalValue / 100000000).toFixed(3)
+                                lineData.totalValue
                               }}</span>
-              <span style="font-weight: 700" v-else>{{ (lineData.totalValue / 10000).toFixed(2) }}</span>
-              <span class="unit" v-if="lineData.totalValue > 99999999">亿元</span>
+              <span style="font-weight: 700" v-else>{{ lineData.totalValue }}</span>
+              <span class="unit" v-if="lineData.totalValue > 99999999">万元</span>
               <span class="unit" v-else>万元</span>
             </div>
           </div>
@@ -51,10 +51,10 @@
             </div>
             <div class="num">
                             <span style="font-weight: 700" v-if="bdData.totalValue > 99999999">{{
-                                (bdData.totalValue / 100000000).toFixed(3)
+                                bdData.totalValue
                               }}</span>
-              <span style="font-weight: 700" v-else>{{ (bdData.totalValue / 10000).toFixed(2) }}</span>
-              <span class="unit" v-if="bdData.totalValue > 99999999">亿元</span>
+              <span style="font-weight: 700" v-else>{{ bdData.totalValue }}</span>
+              <span class="unit" v-if="bdData.totalValue > 99999999">万元</span>
               <span class="unit" v-else>万元</span>
             </div>
           </div>
@@ -105,10 +105,10 @@
             </div>
             <div class="num">
                             <span style="font-weight: 700" v-if="dlData.totalValue > 99999999">{{
-                                (dlData.totalValue / 100000000).toFixed(3)
+                                dlData.totalValue
                               }}</span>
-              <span style="font-weight: 700" v-else>{{ (dlData.totalValue / 10000).toFixed(2) }}</span>
-              <span class="unit" v-if="dlData.totalValue > 99999999">亿元</span>
+              <span style="font-weight: 700" v-else>{{ dlData.totalValue }}</span>
+              <span class="unit" v-if="dlData.totalValue > 99999999">万元</span>
               <span class="unit" v-else>万元</span>
             </div>
           </div>
diff --git a/src/views/screen/cityScreen/components/equStatus/index.vue b/src/views/screen/cityScreen/components/equStatus/index.vue
index 591f5f81..7f0dc3b0 100644
--- a/src/views/screen/cityScreen/components/equStatus/index.vue
+++ b/src/views/screen/cityScreen/components/equStatus/index.vue
@@ -2,8 +2,8 @@
   <div class="content">
     <div class="content-title" style="cursor: pointer" @click="openDialog"></div>
     <div class="content-view">
-      <div id="lineChartFour" style="width: 100%; height: 85%"></div>
       <div class="text">备注说明：在用装备包含共享装备。</div>
+      <div id="lineChartFour" style="width: 100%; height: 85%"></div>
     </div>
   </div>
 </template>
diff --git a/src/views/screen/cityScreen/components/maintenance/index.vue b/src/views/screen/cityScreen/components/maintenance/index.vue
index 0d9702a0..77ccb936 100644
--- a/src/views/screen/cityScreen/components/maintenance/index.vue
+++ b/src/views/screen/cityScreen/components/maintenance/index.vue
@@ -62,7 +62,7 @@ export default {
         console.log(response, 'maintenanceAlarmApi')
         if (response.code == 200) {
           this.totalNum = response.data.total
-          this.tableList = response.data.list
+          this.tableList = response.data.list.slice(0, 7)
         }
       })
     }
diff --git a/src/views/screen/cityScreen/components/retire/index.vue b/src/views/screen/cityScreen/components/retire/index.vue
index a5b35529..99e536c3 100644
--- a/src/views/screen/cityScreen/components/retire/index.vue
+++ b/src/views/screen/cityScreen/components/retire/index.vue
@@ -62,7 +62,7 @@ export default {
         console.log(response, 'retirementAlarmApi')
         if (response.code == 200) {
           this.totalNum = response.data.total
-          this.tableList = response.data.list
+          this.tableList = response.data.list.slice(0, 7)
         }
       })
     }
diff --git a/src/views/screen/cityScreen/components/topIcons/index.vue b/src/views/screen/cityScreen/components/topIcons/index.vue
index f8ba3388..8286d92c 100644
--- a/src/views/screen/cityScreen/components/topIcons/index.vue
+++ b/src/views/screen/cityScreen/components/topIcons/index.vue
@@ -104,13 +104,15 @@ export default {
 
     // 金额格式化 以及单位
     formatMoney(money) {
-      if (money > 99999999) {
-        this.itemList[1].unit = '亿元'
-        return (money / 100000000).toFixed(3)
-      } else {
-        this.itemList[1].unit = '万元'
-        return (money / 10000).toFixed(2)
-      }
+      // if (money > 99999999) {
+      //   this.itemList[1].unit = '亿元'
+      //   return (money / 100000000).toFixed(3)
+      // } else {
+      //   this.itemList[1].unit = '万元'
+      //   return (money / 10000).toFixed(2)
+      // }
+      this.itemList[1].unit = '万元'
+      return money
     }
   }
 }
diff --git a/src/views/screen/cityScreen/index.vue b/src/views/screen/cityScreen/index.vue
index 307c785f..6c2a2c8a 100644
--- a/src/views/screen/cityScreen/index.vue
+++ b/src/views/screen/cityScreen/index.vue
@@ -174,21 +174,21 @@ export default {
 
 .left_5 {
   width: 100%;
-  height: 269px;
+  height: 239px;
   grid-row: 6 / 10;
   grid-column: 1 / 2;
 }
 
 .left_3 {
   width: 100%;
-  height: 150px;
+  height: 180px;
   grid-row: 10 / 13;
   grid-column: 1 / 2;
 }
 
 .left_6 {
   width: 100%;
-  height: 150px;
+  height: 180px;
   grid-row: 13 / 17;
   grid-column: 1 / 2;
 }
diff --git a/src/views/screen/gwScreen/components/center/index.vue b/src/views/screen/gwScreen/components/center/index.vue
index 4b15b789..824201e8 100644
--- a/src/views/screen/gwScreen/components/center/index.vue
+++ b/src/views/screen/gwScreen/components/center/index.vue
@@ -507,8 +507,8 @@ export default {
                   '<div>装备价值：' +
                   '</div>' +
                   "<div style='font-family: YouSheBiaoTiHei;margin-left: 10px;color:rgba(247, 196, 30, 1);'>" +
-                  (data.totalValue / 100000000).toFixed(1) +
-                  " <span style='color:#FFF;font-size:14px'> 亿元</span>" +
+                  data.totalValue +
+                  " <span style='color:#FFF;font-size:14px'> 万元</span>" +
                   '</div>' +
                   '</div>' +
                   "<div style='width: 300px;margin-top:10px;height: 30px;line-height:30px;display: flex;align-items:center; padding-left: 30px;font-family:Source Han Sans CN;font-size: 16px;color: #ffffff;background: url(" +
@@ -721,7 +721,7 @@ export default {
                 else if (this.btnIndex === 2) unit = '台'
                 else if (this.btnIndex === 3) unit = '%'
                 return val.length
-                  ? `{val|${this.btnIndex === 1 ? (val[2] / 100000000).toFixed(1) : val[2]} ${unit}}\n{name|${
+                  ? `{val|${val[2]} ${unit}}\n{name|${
                       params.data.deptName
                     }}`
                   : `{name|${params.data.deptName}}`
diff --git a/src/views/screen/gwScreen/components/left/EquipItem.vue b/src/views/screen/gwScreen/components/left/EquipItem.vue
index 7c00e03b..50957384 100644
--- a/src/views/screen/gwScreen/components/left/EquipItem.vue
+++ b/src/views/screen/gwScreen/components/left/EquipItem.vue
@@ -8,7 +8,7 @@
           <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 }}</div>
         </div>
       </div>
diff --git a/src/views/screen/gwScreen/components/left/LeftItem.vue b/src/views/screen/gwScreen/components/left/LeftItem.vue
index 7f1f0bbc..9163734d 100644
--- a/src/views/screen/gwScreen/components/left/LeftItem.vue
+++ b/src/views/screen/gwScreen/components/left/LeftItem.vue
@@ -7,8 +7,8 @@
           <div class="number">{{ query.num || 0 }}</div>
         </div>
         <div class="left-item">
-          <div class="left-tip">装备价值 <span>（亿元）</span></div>
-          <div class="number">{{ query.price ? (query.price / 100000000).toFixed(4) : 0 }}</div>
+          <div class="left-tip">装备价值 <span>（万元）</span></div>
+          <div class="number">{{ query.price || 0 }}</div>
         </div>
       </div>
       <div>
diff --git a/src/views/screen/gwScreen/components/left/TotalPriceMore.vue b/src/views/screen/gwScreen/components/left/TotalPriceMore.vue
index 445f08b0..7390c35e 100644
--- a/src/views/screen/gwScreen/components/left/TotalPriceMore.vue
+++ b/src/views/screen/gwScreen/components/left/TotalPriceMore.vue
@@ -61,7 +61,7 @@ export default {
         },
         yAxis: {
           type: 'value',
-          name: '单位：亿元',
+          name: '单位：万元',
           axisLine: {
             show: false, // 去掉 y 轴线
           },
diff --git a/src/views/screen/gwScreen/components/left/UnitEquipmentConfig.vue b/src/views/screen/gwScreen/components/left/UnitEquipmentConfig.vue
index 40ef4e0c..65e72ddd 100644
--- a/src/views/screen/gwScreen/components/left/UnitEquipmentConfig.vue
+++ b/src/views/screen/gwScreen/components/left/UnitEquipmentConfig.vue
@@ -7,7 +7,7 @@
         <tr>
           <th>序号</th>
           <th>网省名称</th>
-          <th>装备价值（亿元）</th>
+          <th>装备价值（万元）</th>
           <th>装备数量（台）</th>
           <th>配置率</th>
         </tr>
diff --git a/src/views/screen/gwScreen/components/left/index.vue b/src/views/screen/gwScreen/components/left/index.vue
index 46cf8749..2e82b715 100644
--- a/src/views/screen/gwScreen/components/left/index.vue
+++ b/src/views/screen/gwScreen/components/left/index.vue
@@ -10,7 +10,7 @@
         <div class="equip-item-2" @click="openSystemEquip">{{ equipData.total }} <span class="unit">台</span></div>
         <div class="equip-item-3">总价值</div>
         <div class="equip-item-4" @click="openTotalPrice">
-          {{ (equipData.totalPrice / 100000000).toFixed(4) }} <span class="unit">亿元</span>
+          {{ equipData.totalPrice }} <span class="unit">万元</span>
         </div>
       </div>
       <div class="item-box">
diff --git a/src/views/screen/gwScreen/components/right/index.vue b/src/views/screen/gwScreen/components/right/index.vue
index 4707a68f..4bd3f2fb 100644
--- a/src/views/screen/gwScreen/components/right/index.vue
+++ b/src/views/screen/gwScreen/components/right/index.vue
@@ -8,7 +8,7 @@
       <div class="equipment-list">
         <div class="equip-item1 item">
           <div class="title">年度总投资额</div>
-          <div class="number">{{ 2600 }} <span class="unit">亿元</span></div>
+          <div class="number">{{ 2600 }} <span class="unit">万元</span></div>
         </div>
         <div class="equip-item2 item">
           <div class="title">在建工程数</div>
diff --git a/src/views/screen/wsScreen/components/center/index-old-3d.vue b/src/views/screen/wsScreen/components/center/index-old-3d.vue
index 398cac76..8be926a4 100644
--- a/src/views/screen/wsScreen/components/center/index-old-3d.vue
+++ b/src/views/screen/wsScreen/components/center/index-old-3d.vue
@@ -15,14 +15,14 @@
 
     <!-- 点击城市显示详情 -->
     <div
-      v-if="selectedCity && btnIndex == 1"x'x'x'x
+      v-if="selectedCity && btnIndex == 1"
       class="city-tooltip"
       :style="{ left: tooltipPos.x + 25 + 'px', top: tooltipPos.y + 25 + 'px' }"
     >
       <div class="city-name">{{ selectedCity.cityName }}</div>
       <div
-        >装备价值： <span class="num">{{ (selectedCity.totalValue / 100000000).toFixed(4) }}</span
-        ><span class="unit"> 亿元</span></div
+        >装备价值： <span class="num">{{ selectedCity.totalValue }}</span
+        ><span class="unit"> 万元</span></div
       >
       <div
         >装备数量： <span class="num">{{ selectedCity.totalEquipmentQuantity }}</span
@@ -215,7 +215,7 @@ export default {
                 else if (this.btnIndex === 2) unit = '台'
                 else if (this.btnIndex === 3) unit = '%'
                 return val.length
-                  ? `{val|${this.btnIndex === 1 ? (val[2] / 100000000).toFixed(4) : val[2]} ${unit}}\n{name|${
+                  ? `{val|${val[2]} ${unit}}\n{name|${
                       params.data.deptName
                     }}`
                   : `{name|${params.data.deptName}}`
diff --git a/src/views/screen/wsScreen/components/center/index.vue b/src/views/screen/wsScreen/components/center/index.vue
index 07ff0be2..b1c8f8a0 100644
--- a/src/views/screen/wsScreen/components/center/index.vue
+++ b/src/views/screen/wsScreen/components/center/index.vue
@@ -145,8 +145,8 @@ export default {
                   '<div>装备价值：' +
                   '</div>' +
                   "<div style='font-family: YouSheBiaoTiHei;margin-left: 10px;color:rgba(247, 196, 30, 1);'>" +
-                  (data.totalValue / 100000000).toFixed(4) +
-                  " <span style='color:#FFF;font-size:14px'> 亿元</span>" +
+                  data.totalValue +
+                  " <span style='color:#FFF;font-size:14px'> 万元</span>" +
                   '</div>' +
                   '</div>' +
                   "<div style='width: 300px;margin-top:10px;height: 30px;line-height:30px;display: flex;align-items:center; padding-left: 30px;font-family:Source Han Sans CN;font-size: 16px;color: #ffffff;background: url(" +
@@ -359,9 +359,7 @@ export default {
                 else if (this.btnIndex === 2) unit = '台'
                 else if (this.btnIndex === 3) unit = '%'
                 return val.length
-                  ? `{val|${
-                      this.btnIndex === 1 ? (val[2] > 0 ? (val[2] / 100000000).toFixed(4) : 0) : val[2]
-                    } ${unit}}\n{name|${params.data.deptAbbreviation}}`
+                  ? `{val|${val[2]} ${unit}}\n{name|${params.data.deptAbbreviation}}`
                   : `{name|${params.data.deptAbbreviation}}`
               },
               rich: {
diff --git a/src/views/screen/wsScreen/components/left/EquipItem.vue b/src/views/screen/wsScreen/components/left/EquipItem.vue
index 2b3e2766..cdd171b4 100644
--- a/src/views/screen/wsScreen/components/left/EquipItem.vue
+++ b/src/views/screen/wsScreen/components/left/EquipItem.vue
@@ -8,8 +8,8 @@
           <div class="number">{{ query.num || 0 }}</div>
         </div>
         <div class="left-item">
-          <div class="left-tip">装备价值<span>(亿元)</span></div>
-          <div class="number">{{ query.price ? (query.price / 100000000).toFixed(4) : 0 }}</div>
+          <div class="left-tip">装备价值<span>(万元)</span></div>
+          <div class="number">{{ query.price || 0 }}</div>
         </div>
       </div>
       <div>
diff --git a/src/views/screen/wsScreen/components/left/LeftItem.vue b/src/views/screen/wsScreen/components/left/LeftItem.vue
index 7f1f0bbc..9163734d 100644
--- a/src/views/screen/wsScreen/components/left/LeftItem.vue
+++ b/src/views/screen/wsScreen/components/left/LeftItem.vue
@@ -7,8 +7,8 @@
           <div class="number">{{ query.num || 0 }}</div>
         </div>
         <div class="left-item">
-          <div class="left-tip">装备价值 <span>（亿元）</span></div>
-          <div class="number">{{ query.price ? (query.price / 100000000).toFixed(4) : 0 }}</div>
+          <div class="left-tip">装备价值 <span>（万元）</span></div>
+          <div class="number">{{ query.price || 0 }}</div>
         </div>
       </div>
       <div>
diff --git a/src/views/screen/wsScreen/components/left/TotalPriceMore.vue b/src/views/screen/wsScreen/components/left/TotalPriceMore.vue
index e54de6d1..7a862b64 100644
--- a/src/views/screen/wsScreen/components/left/TotalPriceMore.vue
+++ b/src/views/screen/wsScreen/components/left/TotalPriceMore.vue
@@ -61,7 +61,7 @@ export default {
         },
         yAxis: {
           type: 'value',
-          name: '单位：亿元',
+          name: '单位：万元',
           axisLine: {
             show: false, // 去掉 y 轴线
           },
diff --git a/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue b/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue
index 67c6ddc7..c32268a9 100644
--- a/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue
+++ b/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue
@@ -38,7 +38,7 @@
             align="center"
           >
             <template v-slot="{ row }" v-if="column.prop === 'price'">
-              <span>{{ row.price ? (row.price / 100000000).toFixed(4) : 0 }}</span>
+              <span>{{ row.price || 0 }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -70,7 +70,7 @@ export default {
       },
       tableColumns: [
         { label: '单位名称', prop: 'name' },
-        { label: '装备价值（亿元）', prop: 'price' },
+        { label: '装备价值（万元）', prop: 'price' },
         { label: '装备数量', prop: 'count' },
         { label: '线路数量（台）', prop: 'lineCount' },
         { label: '变电数量（台）', prop: 'substationCount' },
diff --git a/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue b/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue
index d5890200..81f40b2d 100644
--- a/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue
+++ b/src/views/screen/wsScreen/components/left/UnitEquipmentConfig.vue
@@ -6,7 +6,7 @@
         <tr>
           <th rowspan="2" style="width: 30px">序号</th>
           <th rowspan="2" style="width: 110px">单位名称</th>
-          <th rowspan="2" style="width: 60px">装备价值（亿元）</th>
+          <th rowspan="2" style="width: 60px">装备价值（万元）</th>
           <th colspan="4">装备数量（台）</th>
           <th colspan="4">配置率</th>
         </tr>
@@ -29,7 +29,7 @@
         <tr v-for="(row, index) in tableData" :key="index">
           <td class="index-num" style="width: 30px">{{ index + 1 }}</td>
           <td style="width: 110px; font-size: 14px">{{ row.deptName }}</td>
-          <td class="num-yellow" style="width: 60px">{{ row.totalValue ? (row.totalValue / 100000000).toFixed(4) : 0 }}</td>
+          <td class="num-yellow" style="width: 60px">{{ row.totalValue || 0 }}</td>
 
           <td class="num-yellow">{{ row.totalEquipmentQuantity }}</td>
           <td class="index-num">{{ row.lineNum }}</td>
diff --git a/src/views/screen/wsScreen/components/left/index.vue b/src/views/screen/wsScreen/components/left/index.vue
index 12867497..f88ffd10 100644
--- a/src/views/screen/wsScreen/components/left/index.vue
+++ b/src/views/screen/wsScreen/components/left/index.vue
@@ -17,8 +17,8 @@
           <div style="display: flex; flex-direction: column; align-items: center; margin-left: 15px">
             <div class="equip-item-3">总价值</div>
             <div @click="openTotalPrice">
-              <span class="equip-item-4 num-text">{{ (equipData.totalPrice / 100000000).toFixed(4) }}</span>
-              <span class="unit">亿元</span></div
+              <span class="equip-item-4 num-text">{{ equipData.totalPrice }}</span>
+              <span class="unit">万元</span></div
             >
           </div>
         </div>
diff --git a/src/views/screen/wsScreen/components/right/index.vue b/src/views/screen/wsScreen/components/right/index.vue
index c6cc8e5f..28631f04 100644
--- a/src/views/screen/wsScreen/components/right/index.vue
+++ b/src/views/screen/wsScreen/components/right/index.vue
@@ -14,7 +14,7 @@
           <div class="equip-item1 item">
             <div class="title">总投资额</div>
             <div class="number"
-              >{{ annualTotal ? (annualTotal / 100000000).toFixed(4) : 0 }} <span class="unit">亿元</span></div
+              >{{ annualTotal || 0 }} <span class="unit">万元</span></div
             >
           </div>
           <div class="equip-item3 item">
diff --git a/src/views/screen/wsScreenWidescreen/components/center/index-old-3d.vue b/src/views/screen/wsScreenWidescreen/components/center/index-old-3d.vue
index 398cac76..8be926a4 100644
--- a/src/views/screen/wsScreenWidescreen/components/center/index-old-3d.vue
+++ b/src/views/screen/wsScreenWidescreen/components/center/index-old-3d.vue
@@ -15,14 +15,14 @@
 
     <!-- 点击城市显示详情 -->
     <div
-      v-if="selectedCity && btnIndex == 1"x'x'x'x
+      v-if="selectedCity && btnIndex == 1"
       class="city-tooltip"
       :style="{ left: tooltipPos.x + 25 + 'px', top: tooltipPos.y + 25 + 'px' }"
     >
       <div class="city-name">{{ selectedCity.cityName }}</div>
       <div
-        >装备价值： <span class="num">{{ (selectedCity.totalValue / 100000000).toFixed(4) }}</span
-        ><span class="unit"> 亿元</span></div
+        >装备价值： <span class="num">{{ selectedCity.totalValue }}</span
+        ><span class="unit"> 万元</span></div
       >
       <div
         >装备数量： <span class="num">{{ selectedCity.totalEquipmentQuantity }}</span
@@ -215,7 +215,7 @@ export default {
                 else if (this.btnIndex === 2) unit = '台'
                 else if (this.btnIndex === 3) unit = '%'
                 return val.length
-                  ? `{val|${this.btnIndex === 1 ? (val[2] / 100000000).toFixed(4) : val[2]} ${unit}}\n{name|${
+                  ? `{val|${val[2]} ${unit}}\n{name|${
                       params.data.deptName
                     }}`
                   : `{name|${params.data.deptName}}`
diff --git a/src/views/screen/wsScreenWidescreen/components/center/index.vue b/src/views/screen/wsScreenWidescreen/components/center/index.vue
index 75b32dc4..6e3f7975 100644
--- a/src/views/screen/wsScreenWidescreen/components/center/index.vue
+++ b/src/views/screen/wsScreenWidescreen/components/center/index.vue
@@ -145,8 +145,8 @@ export default {
                   '<div>装备价值：' +
                   '</div>' +
                   "<div style='font-family: YouSheBiaoTiHei;margin-left: 10px;color:rgba(247, 196, 30, 1);'>" +
-                  (data.totalValue / 100000000).toFixed(4) +
-                  " <span style='color:#FFF;font-size:14px'> 亿元</span>" +
+                  data.totalValue +
+                  " <span style='color:#FFF;font-size:14px'> 万元</span>" +
                   '</div>' +
                   '</div>' +
                   "<div style='width: 300px;margin-top:10px;height: 30px;line-height:30px;display: flex;align-items:center; padding-left: 30px;font-family:Source Han Sans CN;font-size: 16px;color: #ffffff;background: url(" +
@@ -359,9 +359,7 @@ export default {
                 else if (this.btnIndex === 2) unit = '台'
                 else if (this.btnIndex === 3) unit = '%'
                 return val.length
-                  ? `{val|${
-                      this.btnIndex === 1 ? (val[2] > 0 ? (val[2] / 100000000).toFixed(4) : 0) : val[2]
-                    } ${unit}}\n{name|${params.data.deptAbbreviation}}`
+                  ? `{val|${val[2]} ${unit}}\n{name|${params.data.deptAbbreviation}}`
                   : `{name|${params.data.deptAbbreviation}}`
               },
               rich: {
diff --git a/src/views/screen/wsScreenWidescreen/components/left/EquipItem.vue b/src/views/screen/wsScreenWidescreen/components/left/EquipItem.vue
index 6cc3de81..6546605b 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/EquipItem.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/EquipItem.vue
@@ -8,8 +8,8 @@
           <div class="number">{{ query.num || 0 }}</div>
         </div>
         <div class="left-item">
-          <div class="left-tip">装备价值 <span class="unit">（亿元）</span></div>
-          <div class="number">{{ query.price ? (query.price / 100000000).toFixed(4) : 0 }}</div>
+          <div class="left-tip">装备价值 <span class="unit">（万元）</span></div>
+          <div class="number">{{ query.price || 0 }}</div>
         </div>
       </div>
       <div>
diff --git a/src/views/screen/wsScreenWidescreen/components/left/LeftItem.vue b/src/views/screen/wsScreenWidescreen/components/left/LeftItem.vue
index 7f1f0bbc..9163734d 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/LeftItem.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/LeftItem.vue
@@ -7,8 +7,8 @@
           <div class="number">{{ query.num || 0 }}</div>
         </div>
         <div class="left-item">
-          <div class="left-tip">装备价值 <span>（亿元）</span></div>
-          <div class="number">{{ query.price ? (query.price / 100000000).toFixed(4) : 0 }}</div>
+          <div class="left-tip">装备价值 <span>（万元）</span></div>
+          <div class="number">{{ query.price || 0 }}</div>
         </div>
       </div>
       <div>
diff --git a/src/views/screen/wsScreenWidescreen/components/left/TotalPriceMore.vue b/src/views/screen/wsScreenWidescreen/components/left/TotalPriceMore.vue
index 445f08b0..7390c35e 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/TotalPriceMore.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/TotalPriceMore.vue
@@ -61,7 +61,7 @@ export default {
         },
         yAxis: {
           type: 'value',
-          name: '单位：亿元',
+          name: '单位：万元',
           axisLine: {
             show: false, // 去掉 y 轴线
           },
diff --git a/src/views/screen/wsScreenWidescreen/components/left/UnitEquipConfig.vue b/src/views/screen/wsScreenWidescreen/components/left/UnitEquipConfig.vue
index 9f28afc6..c0fb9525 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/UnitEquipConfig.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/UnitEquipConfig.vue
@@ -38,7 +38,7 @@
             align="center"
           >
             <template v-slot="{ row }" v-if="column.prop === 'price'">
-              <span>{{ row.price ? (row.price / 100000000).toFixed(4) : 0 }}</span>
+              <span>{{ row.price || 0 }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -70,7 +70,7 @@ export default {
       },
       tableColumns: [
         { label: '单位名称', prop: 'name' },
-        { label: '装备价值（亿元）', prop: 'price' },
+        { label: '装备价值（万元）', prop: 'price' },
         { label: '装备数量', prop: 'count' },
         { label: '线路数量（台）', prop: 'lineCount' },
         { label: '变电数量（台）', prop: 'substationCount' },
diff --git a/src/views/screen/wsScreenWidescreen/components/left/UnitEquipmentConfig.vue b/src/views/screen/wsScreenWidescreen/components/left/UnitEquipmentConfig.vue
index fa4a2ab7..6cd88956 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/UnitEquipmentConfig.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/UnitEquipmentConfig.vue
@@ -6,7 +6,7 @@
         <tr>
           <th rowspan="2" style="width: 30px">序号</th>
           <th rowspan="2" style="width: 120px">单位名称</th>
-          <th rowspan="2" style="width: 62px">装备价值（亿元）</th>
+          <th rowspan="2" style="width: 62px">装备价值（万元）</th>
           <th colspan="4">装备数量（台）</th>
           <th colspan="4">配置率</th>
         </tr>
@@ -29,7 +29,7 @@
         <tr v-for="(row, index) in tableData" :key="index">
           <td class="index-num" style="width: 30px">{{ index + 1 }}</td>
           <td style="width: 120px; font-size: 14px">{{ row.deptName }}</td>
-          <td class="num-yellow" style="width: 62px">{{ row.totalValue ? (row.totalValue / 100000000).toFixed(3) : 0 }}</td>
+          <td class="num-yellow" style="width: 62px">{{ row.totalValue || 0 }}</td>
 
           <td class="num-yellow" style="width: 42px;max-width:42px">{{ row.totalEquipmentQuantity }}</td>
           <td class="index-num" style="width: 42px;max-width:42px">{{ row.lineNum }}</td>
diff --git a/src/views/screen/wsScreenWidescreen/components/left/index.vue b/src/views/screen/wsScreenWidescreen/components/left/index.vue
index 52cca796..c879c8da 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/index.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/index.vue
@@ -10,7 +10,7 @@
         <div class="equip-item-2" @click="openSystemEquip">{{ equipData.total }} <span class="unit">台</span></div>
         <div class="equip-item-3">总价值</div>
         <div class="equip-item-4" @click="openTotalPrice"
-          >{{ (equipData.totalPrice / 100000000).toFixed(4) }} <span class="unit">亿元</span></div
+          >{{ equipData.totalPrice || 0 }} <span class="unit">万元</span></div
         >
       </div>
       <div class="item-box">
diff --git a/src/views/screen/wsScreenWidescreen/components/right/index.vue b/src/views/screen/wsScreenWidescreen/components/right/index.vue
index 216bc38e..1f7d7858 100644
--- a/src/views/screen/wsScreenWidescreen/components/right/index.vue
+++ b/src/views/screen/wsScreenWidescreen/components/right/index.vue
@@ -8,7 +8,7 @@
       <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 || 0 }} <span class="unit">万元</span></div>
         </div>
         <div class="equip-item2 item">
           <div class="title">在建工程数</div>
diff --git a/src/views/toolsManage/toolsLedger/index.vue b/src/views/toolsManage/toolsLedger/index.vue
index 0df137b0..97494294 100644
--- a/src/views/toolsManage/toolsLedger/index.vue
+++ b/src/views/toolsManage/toolsLedger/index.vue
@@ -97,9 +97,9 @@
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button> -->
-          <div style="font-size: 20; font-weight: 800">工具台账列表</div>
+          <div style="font-size: 20; font-weight: 800">数量工具台账列表</div>
         </el-col>
-        <el-button icon="el-icon-download" style="margin-left: 1320px" type="primary" size="mini" @click="handleExport">
+        <el-button icon="el-icon-download" style="margin-left: 1290px" type="primary" size="mini" @click="handleExport">
           导出数据
         </el-button>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>