diff --git a/hb_client/src/styles/index.scss b/hb_client/src/styles/index.scss
index 6c43e6a..13d9e10 100644
--- a/hb_client/src/styles/index.scss
+++ b/hb_client/src/styles/index.scss
@@ -71,10 +71,15 @@ div:focus {
 .el-form-item {
   margin-bottom: 16px;
 }
-.el-card, .el-message {
+.el-message {
   border-radius: 0px;
   overflow: hidden;
 }
+.el-card.is-always-shadow{
+  overflow: hidden;
+  box-shadow: none;
+  margin-bottom: 5px;
+}
 .el-card__body {
   padding: 6px;
 }
diff --git a/hb_client/src/views/customerManage/feedback.vue b/hb_client/src/views/customerManage/feedback.vue
index 39d3ba3..e4abb89 100644
--- a/hb_client/src/views/customerManage/feedback.vue
+++ b/hb_client/src/views/customerManage/feedback.vue
@@ -34,13 +34,17 @@
           stripe
           highlight-current-row
           height="100"
-          v-el-height-adaptive-table="{bottomOffset: 42}"
+          v-el-height-adaptive-table="{bottomOffset: 45}"
         >
           <el-table-column label="序号" type="index" width="80"/>
           
           <el-table-column label="客户名称" prop="name" min-width="120">
           </el-table-column>
           <el-table-column label="问题类型" prop="type" min-width="120">
+            <template  slot-scope="scope">
+            <el-tag type="warning" effect="plain">{{ scope.row.type }}</el-tag
+            >
+          </template>
           </el-table-column>
           <el-table-column label="问题描述" prop="indur" min-width="120" show-overflow-tooltip>
           </el-table-column>
@@ -55,6 +59,10 @@
           <el-table-column label="联系电话" prop="phone" min-width="120">
           </el-table-column>
           <el-table-column label="状态" prop="status" min-width="120">
+            <template slot-scope="scope">
+              <el-tag type="danger" effect="plain" v-if="scope.row.status=='未处理'"> {{ scope.row.status }}</el-tag>
+              <el-tag type="success" effect="plain" v-else> {{ scope.row.status}}</el-tag>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
diff --git a/hb_client/src/views/energyManage/energy.vue b/hb_client/src/views/energyManage/energy.vue
index 0197bee..2420fff 100644
--- a/hb_client/src/views/energyManage/energy.vue
+++ b/hb_client/src/views/energyManage/energy.vue
@@ -1,159 +1,136 @@
 <template>
-    <div class="app-container" style="background-color: #ffffff;">
-      <div style="display: flex;">
-        <div class="searchLabel">能源范围</div>
-        <el-select
-            v-model="showType"
-            placeholder="能源范围"
-            clearable
-            style="width: 120px"
-            class="filter-item"
-            @change="handleFilter"
-        >
-            <el-option
-            v-for="item in options"
-            :key="item"
-            :label="item"
-            :value="item"
-            />
-        </el-select>
-        <div class="searchLabel">时间类型</div>
-        <el-select
-            v-model="timeType"
-            placeholder="时间类型"
-            clearable
-            style="width: 120px"
-            class="filter-item"
-            @change="handleFilter"
-        >
-            <el-option
-            v-for="item in timeOption"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-            />
-        </el-select>
-        <div class="searchLabel">开始时间</div>
-        <el-date-picker
-            v-model="startTime"
-            :type="timeType"
-            style="width: 120px"
-            placeholder="开始时间">
-        </el-date-picker>
-        <div class="searchLabel">结束时间</div>
-        <el-date-picker
-            v-model="endTime"
-            :type="timeType"
-            style="width: 120px"
-            placeholder="结束时间">
-        </el-date-picker>
-        <el-button
-          class="filter-item searchBtn"
-          type="primary"
-          icon="el-icon-search"
-        >查询
-        </el-button>
-      </div>
-      <el-row :gutter="20" v-if="showType=='全厂'">
-        <el-col :span="12">
-            <div style="border:1px solid #cccccc;border-radius: 10px;">
-                <div class="chartsTitle">分项统计</div>
-                <charts
-                    :id="chartId"
-                    :options="barOptions"
-                    :className="chartsName"
-                    :height="domHeight"
-                    width="100%"
-                >
-                </charts>
-            </div>
-        </el-col>
-        <el-col :span="12">
-            <div style="border:1px solid #cccccc;border-radius: 10px;">
-                <div class="chartsTitle">能耗占比分析(:kwh)</div>
-                <Echart
-                    :options="pieOptions"
-                    id="pieChart"
-                    :height="domHeight"
-                ></Echart>
-            </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20" v-else>
-        <el-col :span="12">
-            <div style="border:1px solid #cccccc;border-radius: 10px;">
-                <div class="chartsTitle">分项统计</div>
-                <charts
-                :id="chartId1"
-                :options="barOptions1"
-                :className="chartsName"
-                :height="domHeight"
-                width="100%"
-                >
-                </charts>
-            </div>
-        </el-col>
-        <el-col :span="12">
-            <div style="border:1px solid #cccccc;border-radius: 10px;">
-                <div class="chartsTitle">能耗占比分析(:kwh)</div>
-                <Echart
-                :options="pieOptions1"
-                id="pieChart1"
-                :height="domHeight"
-                ></Echart>
-            </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="5" style="margin-top: 5px;">
-        <el-col  v-if="showType=='全厂'" style="border:1px solid #cccccc;border-radius: 10px;">
-            <!-- <el-table
-              small
-              v-loading="orderLoading"
-              :data="orderList.results"
-              border
-              fit
-              stripe
-              size="mini"
-              highlight-current-row
-              height="100"
-              v-el-height-adaptive-table="{bottomOffset: 42}"
-            >
-              <el-table-column label=""  width="120" show-overflow-tooltip>
-                <template slot-scope="scope">{{ scope.row.number }}</template>
-              </el-table-column>
-              <el-table-column label="产品名称"  width="160" show-overflow-tooltip>
-                <template slot-scope="scope">{{ scope.row.product_.name }}</template>
-              </el-table-column>
-              <el-table-column label="产品数量">
-                <template slot-scope="scope">{{ scope.row.count }}</template>
-              </el-table-column>
-              <el-table-column label="已交货数量">
-                <template slot-scope="scope">{{ scope.row.delivered_count }}</template>
-              </el-table-column>
-              <el-table-column label="交货日期">
-                <template slot-scope="scope">{{ scope.row.delivery_date }}</template>
-              </el-table-column>
-            </el-table> -->
+    <div class="app-container">
+      <el-card>
+        <div style="display: flex;">
+          <div class="searchLabel">能源范围</div>
+          <el-select
+              v-model="showType"
+              placeholder="能源范围"
+              clearable
+              style="width: 120px"
+              class="filter-item"
+              @change="handleFilter"
+          >
+              <el-option
+              v-for="item in options"
+              :key="item"
+              :label="item"
+              :value="item"
+              />
+          </el-select>
+          <div class="searchLabel">时间类型</div>
+          <el-select
+              v-model="timeType"
+              placeholder="时间类型"
+              clearable
+              style="width: 120px"
+              class="filter-item"
+              @change="handleFilter"
+          >
+              <el-option
+              v-for="item in timeOption"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+              />
+          </el-select>
+          <div class="searchLabel">开始时间</div>
+          <el-date-picker
+              v-model="startTime"
+              :type="timeType"
+              style="width: 120px"
+              placeholder="开始时间">
+          </el-date-picker>
+          <div class="searchLabel">结束时间</div>
+          <el-date-picker
+              v-model="endTime"
+              :type="timeType"
+              style="width: 120px"
+              placeholder="结束时间">
+          </el-date-picker>
+          <el-button
+            class="filter-item searchBtn"
+            type="primary"
+            icon="el-icon-search"
+          >查询
+          </el-button>
+        </div>
+        <el-row :gutter="20" v-if="showType=='全厂'">
+          <el-col :span="12">
+              <div style="border:1px solid #cccccc;border-radius: 10px;">
+                  <div class="chartsTitle">分项统计</div>
+                  <charts
+                      :id="chartId"
+                      :options="barOptions"
+                      :className="chartsName"
+                      :height="domHeight"
+                      width="100%"
+                  >
+                  </charts>
+              </div>
+          </el-col>
+          <el-col :span="12">
+              <div style="border:1px solid #cccccc;border-radius: 10px;">
+                  <div class="chartsTitle">能耗占比分析(:kwh)</div>
+                  <Echart
+                      :options="pieOptions"
+                      id="pieChart"
+                      :height="domHeight"
+                  ></Echart>
+              </div>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" v-else>
+          <el-col :span="12">
+              <div style="border:1px solid #cccccc;border-radius: 10px;">
+                  <div class="chartsTitle">分项统计</div>
+                  <charts
+                  :id="chartId1"
+                  :options="barOptions1"
+                  :className="chartsName"
+                  :height="domHeight"
+                  width="100%"
+                  >
+                  </charts>
+              </div>
+          </el-col>
+          <el-col :span="12">
+              <div style="border:1px solid #cccccc;border-radius: 10px;">
+                  <div class="chartsTitle">能耗占比分析(:kwh)</div>
+                  <Echart
+                  :options="pieOptions1"
+                  id="pieChart1"
+                  :height="domHeight"
+                  ></Echart>
+              </div>
+          </el-col>
+        </el-row>
+      </el-card>
+      <el-card>
+        <el-row :gutter="5" style="margin-top: 20px;">
+          <div class="chartsTitle"> 分项明细</div> 
+          <el-col  v-if="showType=='全厂'" style="border:1px solid #cccccc;border-radius: 10px;">
             <table class="tableData"  :style="{height: domHeight}">
-                <th class="tableTh">
-                    <td class="thtd" v-for="item in thLists">{{ item }}</td>
-                </th>
-                <tr class="tableTr" v-for="itemtr in trList">
-                    <td class="trtd" v-for="itemtd in itemtr">{{ itemtd }}</td>
-                </tr>
-            </table>
-        </el-col>
-        <el-col v-else style="border:1px solid #cccccc;border-radius: 10px;">
-            <table class="tableData" :style="{height: domHeight}">
-                <th class="tableTh">
-                    <td class="thtd" v-for="item in thLists1">{{ item }}</td>
-                </th>
-                <tr class="tableTr" v-for="itemtr in trList1">
-                    <td class="trtd" v-for="itemtd in itemtr">{{ itemtd }}</td>
-                </tr>
-            </table>
-        </el-col>
-      </el-row>
+                  <th class="tableTh">
+                      <td class="thtd" v-for="item in thLists">{{ item }}</td>
+                  </th>
+                  <tr class="tableTr" v-for="itemtr in trList">
+                      <td class="trtd" v-for="itemtd in itemtr">{{ itemtd }}</td>
+                  </tr>
+              </table>
+          </el-col>
+          <el-col v-else style="border:1px solid #cccccc;border-radius: 10px;">
+              <table class="tableData" :style="{height: domHeight}">
+                  <th class="tableTh">
+                      <td class="thtd" v-for="item in thLists1">{{ item }}</td>
+                  </th>
+                  <tr class="tableTr" v-for="itemtr in trList1">
+                      <td class="trtd" v-for="itemtd in itemtr">{{ itemtd }}</td>
+                  </tr>
+              </table>
+          </el-col>
+        </el-row>
+      </el-card>
     </div>
   </template>
   
@@ -336,7 +313,7 @@
         },
         mounted() {
             let hei = document.getElementsByClassName('app-main')[0].clientHeight;
-            this.domHeight =( hei- 100)/2+'px';
+            this.domHeight =( hei- 188)/2+'px';
             this.getList();
             //全场
             this.barOptions ={
diff --git a/hb_client/src/views/inm/logistics.vue b/hb_client/src/views/inm/logistics.vue
index 9245ea0..f3e5538 100644
--- a/hb_client/src/views/inm/logistics.vue
+++ b/hb_client/src/views/inm/logistics.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
-      <el-card>
+      <el-card shadow="false">
         <div>
           <el-button
             type="primary"
@@ -24,7 +24,7 @@
           </el-button>
         </div>
       </el-card>
-      <el-card>
+      <el-card shadow="false">
         <el-table
           v-loading="listLoading"
           :data="tableData.results"
@@ -33,7 +33,7 @@
           stripe
           highlight-current-row
           height="100"
-          v-el-height-adaptive-table="{bottomOffset: 42}"
+          v-el-height-adaptive-table="{bottomOffset: 45}"
         >
           <el-table-column type="index" width="50"/>
           <el-table-column label="单号" prop="order">
@@ -65,6 +65,9 @@
           <el-table-column label="货物所在地" prop="address">
           </el-table-column>
           <el-table-column label="是否收货" prop="isTake">
+            <template slot-scope="scope">
+              <el-tag type="success" effect="plain"> {{ scope.row.isTake}}</el-tag>
+            </template>
           </el-table-column>
           <el-table-column label="添加时间" prop="addTime" width="160px">
           </el-table-column>
@@ -96,7 +99,7 @@
         return {
           warehouse: defaultewarehouse,
           tableData: {
-            count: 0,
+            count: 3,
             results:[
               {order:'06132132007928',name:'产品C',number:'10',attention:'易碎品',payer:'liman',payName:'李曼',phone:'13212340056',fromPlace:'北京市',receiver:'zongguan',receiverName:'公司综管',toPlace:'江苏省',receiverPhone:'13112340001',carNumber:'京M.6R625',address:'1号仓库',isTake:'是',addTime:'2022-06-18 11:22:32'},
               {order:'06132132007928',name:'产品C',number:'10',attention:'易碎品',payer:'liman',payName:'李曼',phone:'13212340056',fromPlace:'北京市',receiver:'zongguan',receiverName:'公司综管',toPlace:'江苏省',receiverPhone:'13112340001',carNumber:'京M.6R625',address:'1号仓库',isTake:'是',addTime:'2022-06-18 11:22:32'},
diff --git a/hb_client/src/views/mtm/knowledgeBase.vue b/hb_client/src/views/mtm/knowledgeBase.vue
index 11beab5..c8cfff9 100644
--- a/hb_client/src/views/mtm/knowledgeBase.vue
+++ b/hb_client/src/views/mtm/knowledgeBase.vue
@@ -48,6 +48,9 @@
           <el-table-column label="上传人" prop="man" min-width="120">
           </el-table-column>
           <el-table-column label="资料状态" prop="status" min-width="120">
+            <template slot-scope="scope">
+                <el-tag type="success" effect="plain">通过</el-tag>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
@@ -56,8 +59,9 @@
             fixed="right"
           >
             <template slot-scope="scope">
-              <el-link type="primary"> 编辑</el-link>
-              <el-link type="danger">处理</el-link>
+              <el-link type="primary">上传</el-link>
+              <el-link type="primary">编辑</el-link>
+              <el-link type="primary">下载</el-link>
             </template>
           </el-table-column>
         </el-table>
diff --git a/hb_client/src/views/procurement/vendorDetails.vue b/hb_client/src/views/procurement/vendorDetails.vue
index a56625d..274dc18 100644
--- a/hb_client/src/views/procurement/vendorDetails.vue
+++ b/hb_client/src/views/procurement/vendorDetails.vue
@@ -19,8 +19,8 @@
               row-key="id"
               stripe
               style="width: 100%"
-              height="500"
-              :tree-props="{children: 'children'}">
+              height="100"
+              v-el-height-adaptive-table="{bottomOffset: 20}">
               <el-table-column type="index" width="50"/>
               <el-table-column label="物料名称">
                 <template slot-scope="scope">{{ scope.row.name }}</template>
@@ -40,7 +40,8 @@
               fit
               stripe
               style="width: 100%"
-              height="500"
+              height="100"
+              v-el-height-adaptive-table="{bottomOffset: 20}"
             >
               <el-table-column type="index" width="50"/>
               <el-table-column label="物料批次">
diff --git a/hb_client/src/views/safeEnviro/Education.vue b/hb_client/src/views/safeEnviro/Education.vue
index 5e1dd03..fbaebbc 100644
--- a/hb_client/src/views/safeEnviro/Education.vue
+++ b/hb_client/src/views/safeEnviro/Education.vue
@@ -46,7 +46,9 @@
             <template slot-scope="scope">{{ scope.row.createuser__name }}</template>
           </el-table-column>
           <el-table-column label="状态">
-            <template slot-scope="scope">{{ statusOptions[scope.row.state] }}</template>
+            <template slot-scope="scope">
+              <el-tag type="success" effect="plain"> {{ statusOptions[scope.row.state] }}</el-tag>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
@@ -54,11 +56,10 @@
             width="220px"
           >
             <template slot-scope="scope">
-              <el-link
-                v-if="checkPermission(['material_delete'])"
-                type="danger"
-                @click="handleDelete(scope)"
-              >
+              <el-link type="primary">
+                详情
+              </el-link>
+              <el-link type="danger">
                 删除
               </el-link>
             </template>
diff --git a/hb_client/src/views/safeEnviro/hiddenDanger.vue b/hb_client/src/views/safeEnviro/hiddenDanger.vue
index c2491ef..172caae 100644
--- a/hb_client/src/views/safeEnviro/hiddenDanger.vue
+++ b/hb_client/src/views/safeEnviro/hiddenDanger.vue
@@ -63,11 +63,10 @@
             width="220px"
           >
             <template slot-scope="scope">
-              <el-link
-                v-if="checkPermission(['material_delete'])"
-                type="danger"
-                @click="handleDelete(scope)"
-              >
+              <el-link type="primary">
+                详情
+              </el-link>
+              <el-link type="danger">
                 删除
               </el-link>
             </template>
diff --git a/hb_client/src/views/safeEnviro/riskControl.vue b/hb_client/src/views/safeEnviro/riskControl.vue
index b976b79..ebb1b89 100644
--- a/hb_client/src/views/safeEnviro/riskControl.vue
+++ b/hb_client/src/views/safeEnviro/riskControl.vue
@@ -33,7 +33,9 @@
             <template slot-scope="scope">{{ scope.row.name }}</template>
           </el-table-column>
           <el-table-column label="级别">
-            <template slot-scope="scope">{{ scope.row.level }}</template>
+            <template slot-scope="scope">
+              <el-tag type="success" effect="plain">{{ scope.row.level }}</el-tag>
+            </template>
           </el-table-column>
           <el-table-column label="层级">
             <template slot-scope="scope">{{ scope.row.gkcj }}</template>
@@ -53,11 +55,7 @@
             width="220px"
           >
             <template slot-scope="scope">
-              <el-link
-                v-if="checkPermission(['material_delete'])"
-                type="danger"
-                @click="handleDelete(scope)"
-              >
+              <el-link type="danger">
                 删除
               </el-link>
             </template>