部分修改

src/views/jsc/components/WarehouseTable.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="warehouse-table">
+    <div class="warehouse-table-title">年度物资动态</div>
     <!-- Element-UI 表格 -->
     <el-table :data="currentPageData" style="width: 100%" height="200" :row-class-name="getRowClass"
       :cell-style="{background: 'transparent', border: 'none'}" :header-cell-class-name="'headerRow'">
-      <el-table-column show-overflow-tooltip prop="suozaicangku_text"  width="100" label="仓库" align="left" />
       <el-table-column show-overflow-tooltip prop="type" width="80" label="出入库" align="center" />
+      <el-table-column show-overflow-tooltip prop="zichanmingcheng" width="120" label="物资名称" align="left" />
       <el-table-column show-overflow-tooltip prop="total" width="80" label="数量" align="center" />
-      <el-table-column show-overflow-tooltip prop="fenlei_text" width="120" label="种类" align="left" />
+      <el-table-column show-overflow-tooltip prop="suozaicangku_text" width="100" label="仓库" align="left" />
       <el-table-column show-overflow-tooltip prop="riqi" label="时间" width="100" align="left" />
     </el-table>
 
@@ -65,6 +66,7 @@
             suozaicangku_text: item.suozaicangku_text,
             type: item.jieyongshuliang ? '出库' : '入库',
             total: item.jieyongshuliang ? item.jieyongshuliang : item.rukushuliang,
+            zichanmingcheng: item.zichanmingcheng,
             fenlei_text: item.fenlei_text,
             riqi: item.riqi ? item.riqi : item.created_at.substring(0, 10)
           })
@@ -119,6 +121,8 @@
     margin-bottom: 20px;
   }
 
+
+
   /* 四角三角形基础样式 */
   .corner {
     position: absolute;
@@ -164,6 +168,7 @@
   ::v-deep .el-table {
     background: transparent !important;
   }
+
   ::v-deep .el-table tr {
     background: transparent !important;
   }
@@ -189,20 +194,27 @@
     color: #ef830f !important;
     /* 绿色文字 */
   }
+
   ::v-deep .el-table .el-table__cell {
     padding: 10px 0;
   }
+
   ::v-deep .el-table__body {
     border-collapse: separate !important;
     border-spacing: 0 5px !important;
     table-layout: auto !important;
   }
-  ::v-deep .el-table,.el-table__expanded-cell {
+
+  ::v-deep .el-table,
+  .el-table__expanded-cell {
     background-color: transparent !important;
   }
-  ::v-deep .el-table--enable-row-transition .el-table__body td,.el-table .cell {
+
+  ::v-deep .el-table--enable-row-transition .el-table__body td,
+  .el-table .cell {
     background-color: transparent;
   }
+
   /* 移除表格边框 */
   // ::v-deep .el-table, .el-table__header-wrapper, .el-table__body-wrapper {
   //   border: none !important;

src/views/jsc/index.vue

@@ -5,7 +5,7 @@
         <div v-for="item in topObj">
           <div class="label">{{ item.label }}</div>
           <div class="value">
-            {{ item.value }}
+            {{ item.value }} <span style="font-size: 0.2rem;">{{item.unit?item.unit:''}}</span>
             <!-- <CountUp :end="item.value" :duration="6" ref="count" /> -->
           </div>
         </div>
@@ -13,6 +13,7 @@
       <div class="jscC-center">
         <div class="jscC-center-left" >
           <div class="jscC-center-top">
+            <div class="jscC-center-left-title">年度物资动态</div>
             <WarehouseTable></WarehouseTable>
           </div>
           <!-- <Pie3DChart :data="upList"></Pie3DChart> -->
@@ -92,11 +93,13 @@ export default {
       topObj: [{
         label: '仓库数量',
         value: 0,
-        id: 'cangku_count'
+        id: 'cangku_count',
+        unit:'间'
       }, {
         label: '物资种类',
         value: 0,
-        id: 'wuzizhonglei_count'
+        id: 'wuzizhonglei_count',
+        unit:'类'
       },
       // {
       //   label: '本月出库',
@@ -108,22 +111,35 @@ export default {
       //   id: 'ruku_month_count'
       // },
       {
-        label: '应急调度次数',
+        label: '本年度市级调度',
         value: 0,
-        id: 'yingjidiaodu_count'
+        id: 'yingjidiaodu_count',
+        unit:'次'
       }, {
-        label: '装备总数',
+        label: '队伍数量',
         value: 0,
-        id: 'shebei_count'
+        id: 'shebei_count',
+        unit:'个'
       }, {
-        label: '盘点',
+        label: '队伍出动人次',
         value: 0,
-        id: 'pan_count'
-      }, {
-        label: '维护',
-        value: 0,
-        id: 'weihu_count'
-      }],
+        id: 'shebei_count',
+        unit:'人次'
+      }
+      // {
+      //   label: '装备总数',
+      //   value: 0,
+      //   id: 'shebei_count'
+      // }, {
+      //   label: '盘点',
+      //   value: 0,
+      //   id: 'pan_count'
+      // }, {
+      //   label: '维护',
+      //   value: 0,
+      //   id: 'weihu_count'
+      // },
+      ],
       bottomObj: [{
         label: '库存管理',
         path: '/views/inventorys'