diff --git a/src/api/classify/classify.js b/src/api/classify/classify.js
index 67eac8af..0d63dc16 100644
--- a/src/api/classify/classify.js
+++ b/src/api/classify/classify.js
@@ -72,4 +72,31 @@ export const $_findIndicatorsDetail = (data) => {
     method: 'post',
     data
   })
+}
+
+// 指标列表编辑
+export const $_updateIndicators = (data) => {
+  return request({
+    url: '/api/logpm-supervise/indicators/updateIndicators',
+    method: 'post',
+    data
+  })
+}
+
+// 指标列表删除
+export const $_removeByIds = (data) => {
+  return request({
+    url: '/api/logpm-supervise/indicators/removeById',
+    method: 'post',
+    data
+  })
+}
+
+// 分类指标下拉
+export const $_selectChildCalssifyList = (data) => {
+  return request({
+    url: '/api/logpm-supervise/classify/selectChildCalssifyList',
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file
diff --git a/src/option/supervise/supervise.js b/src/option/supervise/supervise.js
index f5f28ac7..ff0233cd 100644
--- a/src/option/supervise/supervise.js
+++ b/src/option/supervise/supervise.js
@@ -72,6 +72,85 @@ export const classificationColumnList = [
   },
 ];
 
+
+
+export const managementColumnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+
+  {
+    prop: 'name',
+    label: '指标名称',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'description',
+    label: '指标描述',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'name',
+    label: '指标分类',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+
+  {
+    prop: 'createTime',
+    label: '创建时间',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: '',
+    label: '操作',
+    type: 6,
+    values: '',
+    width: '80',
+    checkarr: [],
+    fixed: 'right',
+    sortable: false,
+  },
+];
+
+
+
 //  指标列表
 export const IndicatorColumnList = [
   {
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 8d1f28b0..c0f0297c 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -907,7 +907,6 @@ import { getToken } from '@/utils/auth';
 import NProgress from 'nprogress';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import functions from '@/utils/functions.js';
-import website from '@/config/website';
 import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方
 import {
   ref,
diff --git a/src/views/supervise/IndicatorList.vue b/src/views/supervise/IndicatorList.vue
index 98f6a4a3..5709f1fb 100644
--- a/src/views/supervise/IndicatorList.vue
+++ b/src/views/supervise/IndicatorList.vue
@@ -2,7 +2,7 @@
   <basic-container>
     <!-- 首页表格 -->
 
-    <div class="avue-crud">
+    <div class="avue-crud content_max">
       <!-- 搜索模块 -->
       <el-row v-if="search" class="el_header_top">
         <!-- 查询模块 -->
@@ -11,7 +11,7 @@
           <div class="el_seaTop">
             <el-form-item label="考核部门：">
               <el-select
-                v-model="searchFrom.a"
+                v-model="searchFrom.assessDeptName"
                 class="m-2"
                 placeholder="请选择考核部门"
                 style="width: 240px"
@@ -33,10 +33,10 @@
                 style="width: 240px"
               >
                 <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  v-for="item in classificationoptions"
+                  :key="item.id"
+              :label="item.name"
+              :value="item.id"
                 />
               </el-select>
             </el-form-item>
@@ -64,10 +64,6 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" @click="AddCategory">
-              <el-icon><Plus /></el-icon>新 增</el-button
-            >
-
             <el-button type="primary" @click="BatchDelete">
               <el-icon><Plus /></el-icon>批量删除</el-button
             >
@@ -136,6 +132,7 @@
         :model="lassificationform"
         label-width="70px"
         class="el_listForm"
+        disabled
       >
         <el-form-item label="指标名称">
           <el-input v-model="lassificationform.classifyName" placeholder="暂无" />
@@ -218,7 +215,85 @@
 
     <!-- 编辑弹窗 -->
 
-    <el-dialog v-model="IndicatorEditing" title="Tips" width="40%">
+    <el-dialog v-model="IndicatorEditing" title="编辑" width="30%">
+      <el-form v-loading="Indicatoreditingload" :model="lassificationformedit" label-width="70px">
+        <el-form-item label="考核部门">
+          <el-select
+            v-model="lassificationformedit.assessDept"
+            class="m-2"
+            placeholder="Select"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="指标分类">
+          <el-select
+            v-model="Indicatorediting.value"
+            class="m-2"
+            placeholder="Select"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="指标项目">
+          <el-select
+            v-model="Indicatorediting.value"
+            class="m-2"
+            placeholder="Select"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="指标分数">
+          <el-select
+            v-model="Indicatorediting.value"
+            class="m-2"
+            placeholder="Select"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="考核人">
+          <el-input v-model="lassificationformedit.assessUserName" placeholder="请输入考核人" />
+        </el-form-item>
+
+        <el-form-item label="分数备注">
+          <el-input v-model="lassificationformedit.textarea" :rows="4" type="textarea" placeholder="请输入分数备注" />
+        </el-form-item>
+
+        
+        <el-form-item label="异议描述">
+          <el-input v-model="lassificationformedit.objectionRemark" :rows="4" type="textarea" placeholder="请输入分数备注" />
+        </el-form-item>
+      </el-form>
+
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="IndicatorEditing = false">关闭</el-button>
@@ -241,6 +316,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { ref, reactive, computed, onMounted } from 'vue';
 import { IndicatorColumnList } from '@/option/supervise/supervise.js';
+import functions from '@/utils/functions.js';
 import {
   $_Getclassify,
   $_newlyadded,
@@ -248,35 +324,39 @@ import {
   $_classifyAddChild,
   $_findIndicatorsList,
   $_findIndicatorsDetail,
+  $_updateIndicators,
+  $_removeByIds,
+  $_selectChildCalssifyList,
+  $_selectParentCalssifyList,
 } from '@/api/classify/classify';
 const loadingclassification = ref(false); //指标分类加载效果
 const classificationdata = ref([]); //指标分类数据
 const current = ref(1); //当前页
-const total = ref(10); //总页数
+const total = ref(0); //总页数
 const IndicatorEditing = ref(false); //编辑弹窗
 const pageSize = ref(50);
 const lassificationform = ref({}); //分类表单
+const lassificationformedit = ref({}); //编辑分类表单
 const title = ref(true); //标题
 const EditID = ref(true); //编辑需要的ID
 const newlyAdded = ref(false); //新增弹窗
 const loadingAddPopup = ref(false); //弹窗加载
 const selectionList = ref([]); //选中数据
+const classificationoptions= ref([]);//指标分类
 const searchFrom = ref({}); //搜索表单
+const drawerShow = ref(false); //抽屉显示隐藏
 const search = ref(true); //头部搜索
-const url = 'https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg';
-const srcList = [
-  'https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg',
-  'https://fuss10.elemecdn.com/1/34/19aa98b1fcb2781c4fba33d850549jpeg.jpeg',
-  'https://fuss10.elemecdn.com/0/6f/e35ff375812e6b0020b6b4e8f9583jpeg.jpeg',
-  'https://fuss10.elemecdn.com/9/bb/e27858e973f5d7d3904835f46abbdjpeg.jpeg',
-  'https://fuss10.elemecdn.com/d/e6/c4d93a3805b3ce3f323f7974e6f78jpeg.jpeg',
-  'https://fuss10.elemecdn.com/3/28/bbf893f792f03a54408b3b7a7ebf0jpeg.jpeg',
-  'https://fuss10.elemecdn.com/2/11/6535bcfb26e4c79b48ddde44f4b6fjpeg.jpeg',
-];
+const Indicatorediting = ref({}); //编辑表单
+const columnList=ref()
+const Indicatoreditingload = ref(false); //编辑加载
+
+const url = '';
+const srcList = [];
 const onLoad = () => {
   let data = {
     current: current.value,
     size: pageSize.value,
+    ...searchFrom.value,//搜索参数
   };
   loadingclassification.value = true; //开启加载效果
   $_findIndicatorsList(data)
@@ -293,17 +373,29 @@ const onLoad = () => {
     });
 };
 onLoad();
+// 条数
+const sizeChange = (val) => {
+pageSize.value=val
+  onLoad();
+};
 // 页码
-const sizeChange = () => {};
-const currentPage = () => {};
-const currentChange = () => {};
+const currentChange = (val) => {
+    current.value=val
+  onLoad();
+};
 // 分类编辑
 const ClassificationDditing = val => {
   EditID.value = val.row.id; //编辑需要的ID
   let data = val.row;
   IndicatorEditing.value = true; //编辑弹窗展开
 };
-
+// 获取指标分类
+const Obtainclassification=()=>{
+  $_selectParentCalssifyList().then(res => {
+    classificationoptions.value = res.data.data;
+  });
+}
+Obtainclassification()
 // 分类新增按钮
 const AddCategory = () => {};
 
@@ -319,13 +411,13 @@ const BatchDelete = () => {
   loadingclassification.value = true; //开启加载效果
 
   let data = {
-    ids: [],
+    id: [],
   };
-  data['ids'] = selectionList.value.map(res => res.id);
-  data['ids'] = data['ids'].join(',');
+  data['id'] = selectionList.value.map(res => res.id);
+  data['id'] = data['id'].join(',');
   console.log(data, '批量删除');
 
-  $_newlyremove(data)
+  $_removeByIds(data)
     .then(res => {
       console.log(res, '删除成功返回值');
       ElMessage({
@@ -339,9 +431,16 @@ const BatchDelete = () => {
       loadingclassification.value = false; //关闭加载效果
     });
 };
+// 分类指标
+const classificationindicators = () => {
+  $_selectChildCalssifyList({ id: '1750415995741130754' }).then(res => {
+    console.log(res, '分类列表');
+  });
+};
+classificationindicators();
 // 分类删除
 const CategoryDeletion = val => {
-  ElMessageBox.confirm(`是否删除${val.row.name}分类?`, 'Warning', {
+  ElMessageBox.confirm(`是否删除${val.row.classifyName}分类?`, 'Warning', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning',
@@ -350,17 +449,20 @@ const CategoryDeletion = val => {
       loadingclassification.value = true; //开启加载效果
       console.log(val, '分类删除');
       let data = {
-        ids: [],
+        id: [],
       };
-      data['ids'].push(val.row.id);
-      data['ids'] = data['ids'].join(',');
-      $_newlyremove(data)
+      data['id'].push(val.row.id);
+      data['id'] = data['id'].join(',');
+      $_removeByIds(data)
         .then(res => {
-          console.log(res, '删除成功返回值');
-          ElMessage({
-            message: res.data.msg,
-            type: 'success',
-          });
+          if (res.data.code == 200) {
+            console.log(res, '删除成功返回值');
+            ElMessage({
+              message: res.data.msg,
+              type: 'success',
+            });
+            onLoad();
+          }
         })
         .catch(res => {})
         .finally(() => {
@@ -370,6 +472,22 @@ const CategoryDeletion = val => {
     })
     .catch(() => {});
 };
+
+/** 展开列表控件 */
+const showdrawer = _flag => {
+  drawerShow.value = _flag;
+};
+/**
+ * 设置列表 -- 固定函数
+ * 弹窗的勾选回调，用于更改头部数组
+ * 固定搭配，只需要更换   columnList
+ *  */
+ const setnewcolum = (newarr, headarr, type) => {
+  if (type == 1) {
+    columnList.value = newarr;
+    functions.setStorage(window.location.pathname + 'checkList', headarr);
+  }
+};
 // 新增/编辑分类
 const newlyAddedFn = () => {
   loadingclassification.value = true; //开启加载效果
@@ -419,22 +537,23 @@ const ClassificationIndicatorView = val => {
       loadingAddPopup.value = true; //开启弹窗加载效果
       console.log(res, '查看信息返回值');
       lassificationform.value = res.data.data; //赋值给弹窗表单
-    //   指标状态1 表示提交 2 表示审核 通过 3 表示审核失败
-       if(res.data.data. indicatorsStatus== 1){
-        lassificationform.value.isObjection='提交'
-       }else if(res.data.data.isObjection == 2){
-        lassificationform.value.isObjection='审核通过'
-       }else if(res.data.data.isObjection == 3){
-        lassificationform.value.isObjection='审核失败'
-       }
-    //    是否存在异议 0 表示没有1表示存在
-       if(res.data.data.isObjection ){
-        lassificationform.value.isObjection='没有'
-       }else{
-
-       }lassificationform.value.isObjection='存在'
+      //   指标状态1 表示提交 2 表示审核 通过 3 表示审核失败
+      if (res.data.data.indicatorsStatus == 1) {
+        lassificationform.value.isObjection = '提交';
+      } else if (res.data.data.isObjection == 2) {
+        lassificationform.value.isObjection = '审核通过';
+      } else if (res.data.data.isObjection == 3) {
+        lassificationform.value.isObjection = '审核失败';
+      }
+      //    是否存在异议 0 表示没有1表示存在
+      if (res.data.data.isObjection) {
+        lassificationform.value.isObjection = '没有';
+      } else {
+      }
+      lassificationform.value.isObjection = '存在';
       if (res.data.data.pictures.length) {
         // 图片
+        url.value = res.data.data.pictures[0].url; //赋值给弹窗图片
         res.data.data.pictures.forEach(res => {
           srcList.value.push(res.url);
         });
@@ -446,9 +565,31 @@ const ClassificationIndicatorView = val => {
     });
 };
 // 编辑信息
-const IndicatorEditingFn = () => {};
+const IndicatorEditingFn = () => {
+    let data={
+        assessDept:'',//考核部门ID
+        assessDeptName:'',//考核部门名称
+
+        assessUserId:'',//考核人ID
+        assessUserName:'',//考核人名称
+
+        point:'',//指标分数
+        remark:'',//分数备注
+        objectionRemark:'',//异议描述
+    }
+    return
+    $_updateIndicators(data).then(res=>{
+        console.log(res,'编辑成功');
+    })
+};
+const searchChangeS=()=>{
+    searchFrom.value={};//重置搜索参数
+    onLoad();
+}
 // 查询搜索
-const searchChange = () => {};
+const searchChange = () => {
+    onLoad()
+};
 </script>
 
 <style scoped lang="scss">
@@ -501,4 +642,24 @@ const searchChange = () => {};
     height: 100% !important;
   }
 }
+:deep(.el-card) {
+  height: 100% !important;
+  .el-card__body {
+    height: 100%;
+    .content_max {
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+      .el-fy {
+        flex: 1;
+        display: flex;
+        align-items: flex-end;
+        margin-bottom: 10px;
+      }
+    }
+  }
+}
+.maboxhi{
+  height: 700px !important;
+}
 </style>
diff --git a/src/views/supervise/classify.vue b/src/views/supervise/classify.vue
index cb000c2f..771b935e 100644
--- a/src/views/supervise/classify.vue
+++ b/src/views/supervise/classify.vue
@@ -2,7 +2,7 @@
   <basic-container>
     <!-- 首页表格 -->
 
-    <div class="avue-crud">
+    <div class="avue-crud content_max">
       <!-- 搜索模块 -->
       <el-row v-if="search">
         <!-- 查询模块 -->
@@ -32,7 +32,7 @@
           <div class="avue-crud__right">
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-            <el-button icon="Search" @click="searchHide" circle></el-button>
+            <!-- <el-button icon="Search" @click="searchHide" circle></el-button> -->
           </div>
         </div>
       </el-row>
@@ -123,32 +123,41 @@
     @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
-    :columnList="classificationColumnList"
+    :columnList="columnList"
   ></edittablehead>
 </template>
 
 <script setup>
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { ref, reactive, computed, onMounted } from 'vue';
+import { ref, reactive, computed, onMounted, watch } from 'vue';
 import { classificationColumnList } from '@/option/supervise/supervise.js';
-import { $_Getclassify, $_newlyadded, $_newlyremove,$_classifyAddChild  } from '@/api/classify/classify';
+import functions from '@/utils/functions.js';
+import {
+  $_Getclassify,
+  $_newlyadded,
+  $_newlyremove,
+  $_classifyAddChild,
+} from '@/api/classify/classify';
 const loadingclassification = ref(false); //指标分类加载效果
 const classificationdata = ref([]); //指标分类数据
 const current = ref(1); //当前页
-const total = ref(10); //总页数
-const pageSize = ref(50);
+const total = ref(0); //总页数
+const drawerShow = ref(false); //列表配置显示
+const pageSize = ref(30);
 const lassificationform = ref({}); //分类表单
 const title = ref(true); //标题
 const EditID = ref(true); //编辑需要的ID
+const  columnList = ref([]); //列表配置
 const newlyAdded = ref(false); //新增弹窗
 const loadingAddPopup = ref(false); //弹窗加载
-const selectionList=ref([]);//选中数据
+const selectionList = ref([]); //选中数据
 const onLoad = () => {
   let data = {
     current: current.value,
     size: pageSize.value,
-    isPid:1,
+    isPid: 1,
   };
+  columnList.value=classificationColumnList
   loadingclassification.value = true; //开启加载效果
   $_Getclassify(data)
     .then(res => {
@@ -160,13 +169,42 @@ const onLoad = () => {
     .finally(() => {
       loadingclassification.value = false; //开启加载效果
     });
-
 };
 onLoad();
+const searchChangeS = () => {
+  onLoad();
+};
+/** 展开列表控件 */
+const showdrawer = _flag => {
+  drawerShow.value = _flag;
+};
+/**
+ * 设置列表 -- 固定函数
+ * 弹窗的勾选回调，用于更改头部数组
+ * 固定搭配，只需要更换   columnList
+ *  */
+const setnewcolum = (newarr, headarr, type) => {
+  if (type == 1) {
+    columnList.value = newarr;
+    functions.setStorage(window.location.pathname + 'checkList', headarr);
+  } else if (type == 2) {
+    columnList.value = newarr;
+    functions.setStorage(window.location.pathname + 'flexList', headarr);
+  } else if (type == 3) {
+    columnList.value = newarr;
+    functions.setStorage(window.location.pathname + 'sortlist', headarr);
+  }
+};
 // 页码
-const sizeChange = () => {};
+const sizeChange = val => {
+  pageSize.value = val;
+  onLoad();
+};
 const currentPage = () => {};
-const currentChange = () => {};
+const currentChange = val => {
+  current.value = val;
+  onLoad();
+};
 // 分类编辑
 const ClassificationDditing = val => {
   EditID.value = val.row.id; //编辑需要的ID
@@ -182,42 +220,41 @@ const ClassificationDditing = val => {
 const AddCategory = () => {
   title.value = true; //开启新增
   newlyAdded.value = true; //开启编辑
-  lassificationform.value={};//重置表单
+  lassificationform.value = {}; //重置表单
 };
 
 // 批量删除分类
-const BatchDelete=()=>{
-if(!selectionList.value.length){
+const BatchDelete = () => {
+  if (!selectionList.value.length) {
     ElMessage({
-    message: '请勾选要批量删除的数据',
-    type: 'warning',
-  })
-return 
-}
-loadingclassification.value = true; //开启加载效果
-  
-      let data = {
-        ids: [],
-      };
-      data['ids'] = selectionList.value.map(res=>res.id)
-      data['ids'] = data['ids'].join(',') 
-      console.log(data, '批量删除');
-    
-      $_newlyremove(data)
-        .then(res => {
-          console.log(res, '删除成功返回值');
-          ElMessage({
-            message: res.data.msg,
-            type: 'success',
-          });
-          onLoad();  
-        })
-        .catch(res => {})
-        .finally(() => {
-          loadingclassification.value = false; //关闭加载效果
-        });
-   
-}
+      message: '请勾选要批量删除的数据',
+      type: 'warning',
+    });
+    return;
+  }
+  loadingclassification.value = true; //开启加载效果
+
+  let data = {
+    ids: [],
+  };
+  data['ids'] = selectionList.value.map(res => res.id);
+  data['ids'] = data['ids'].join(',');
+  console.log(data, '批量删除');
+
+  $_newlyremove(data)
+    .then(res => {
+      console.log(res, '删除成功返回值');
+      ElMessage({
+        message: res.data.msg,
+        type: 'success',
+      });
+      onLoad();
+    })
+    .catch(res => {})
+    .finally(() => {
+      loadingclassification.value = false; //关闭加载效果
+    });
+};
 // 分类删除
 const CategoryDeletion = val => {
   ElMessageBox.confirm(`是否删除${val.row.name}分类?`, 'Warning', {
@@ -246,9 +283,9 @@ const CategoryDeletion = val => {
         .finally(() => {
           loadingclassification.value = false; //关闭加载效果
         });
-     
     })
-    .catch(() => {}).finally(()=>{
+    .catch(() => {})
+    .finally(() => {
       loadingclassification.value = false; //关闭加载效果
     });
 };
@@ -285,10 +322,10 @@ const newlyAddedFn = () => {
     });
 };
 // 表格选择
-const selectionChange=(list)=>{
-    selectionList.value=list
-    console.log(selectionList.value,'已经选中的数据');
-}
+const selectionChange = list => {
+  selectionList.value = list;
+  console.log(selectionList.value, '已经选中的数据');
+};
 </script>
 
 <style scoped lang="scss">
@@ -303,4 +340,24 @@ const selectionChange=(list)=>{
   display: flex;
   justify-content: space-evenly;
 }
+:deep(.el-card) {
+  height: 100% !important;
+  .el-card__body {
+    height: 100%;
+    .content_max {
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+      .el-fy {
+        flex: 1;
+        display: flex;
+        align-items: flex-end;
+        margin-bottom: 10px;
+      }
+    }
+  }
+}
+.maboxhi {
+  height: 700px !important;
+}
 </style>
diff --git a/src/views/supervise/management.vue b/src/views/supervise/management.vue
index 9121e00f..5666462f 100644
--- a/src/views/supervise/management.vue
+++ b/src/views/supervise/management.vue
@@ -2,15 +2,38 @@
   <basic-container>
     <!-- 首页表格 -->
 
-    <div class="avue-crud">
+    <div class="avue-crud content_max">
       <!-- 搜索模块 -->
       <el-row v-if="search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query" class="el-fr-d">
+        <el-form :inline="true" :model="queryTop" class="el-fr-d">
           <!-- 查询按钮 -->
+          <div class="el_left_input"> 
+          <el-form-item label="指标名称">
+            <el-input v-model="queryTop.input" placeholder="请输入指标名称" />
+          </el-form-item>
+
+          <el-form-item label="指标类型">
+      
+          <el-select
+            v-model="queryTop.classificationoptionsvalue"
+            filterable
+            placeholder="请选择指标分类"
+            style="width:100%"
+          >
+            <el-option
+              v-for="item in classificationoptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+      </div>
+     
+
           <el-form-item class="el-btn">
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
           </el-form-item>
         </el-form>
       </el-row>
@@ -41,7 +64,7 @@
       <el-row>
         <!-- 列表模块 -->
         <tablecmt
-          :columnList="classificationColumnList"
+          :columnList="managementColumnList"
           :tableData="classificationdata"
           :loading="loadingclassification"
           @inputTxt="inputsc"
@@ -145,14 +168,15 @@
     @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
-    :columnList="classificationColumnList"
+    :columnList="managementColumnList"
   ></edittablehead>
 </template>
 
 <script setup>
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { ref, reactive, computed, onMounted } from 'vue';
-import { classificationColumnList } from '@/option/supervise/supervise.js';
+import { managementColumnList } from '@/option/supervise/supervise.js';
+import functions from '@/utils/functions.js';
 import {
   $_Getclassify,
   $_newlyadded,
@@ -164,22 +188,27 @@ import {
 const loadingclassification = ref(false); //指标分类加载效果
 const classificationdata = ref([]); //指标分类数据
 const current = ref(1); //当前页
-const total = ref(10); //总页数
-const pageSize = ref(50);
+const total = ref(0); //总页数
+const pageSize = ref(30);
 const lassificationform = ref({}); //分类表单
 const title = ref(true); //标题
+const search=ref(false);//顶部搜索
 const EditID = ref(true); //编辑需要的ID
+const queryTop=ref({});//顶部搜索
 const newlyAdded = ref(false); //新增弹窗
 const loadingAddPopup = ref(false); //弹窗加载
 const selectionList = ref([]); //选中数据
 const classificationoptions = ref([]); //指标分类接口
 const classificationoptionsvalue = ref([]); //分类选择的
 const PointsList = ref([{ integral: 0 }]); //积分列表
-const onLoad = () => {
+const columnList=ref([])
+const drawerShow=ref(false);//抽屉显示
+const onLoad = (val) => {
   let data = {
     current: current.value,
     size: pageSize.value,
     isPid: 0,
+    ...val
   };
   loadingclassification.value = true; //开启加载效果
   $_Getclassify(data)
@@ -193,17 +222,48 @@ const onLoad = () => {
       loadingclassification.value = false; //开启加载效果
     });
   // 获取分类
+
+};
+/** 展开列表控件 */
+const showdrawer = _flag => {
+  drawerShow.value = _flag;
+};
+/**
+ * 设置列表 -- 固定函数
+ * 弹窗的勾选回调，用于更改头部数组
+ * 固定搭配，只需要更换   columnList
+ *  */
+ const setnewcolum = (newarr, headarr, type) => {
+  if (type == 1) {
+    columnList.value = newarr;
+    functions.setStorage(window.location.pathname + 'checkList', headarr);
+  }
+};
+// 获取指标分类
+const Obtainclassification=()=>{
   $_selectParentCalssifyList().then(res => {
-    console.log(res, '指标分类');
     classificationoptions.value = res.data.data;
-    console.log(classificationoptions.value, '存储的指标');
   });
-};
+}
+Obtainclassification()
 onLoad();
-// 页码
-const sizeChange = () => {};
-const currentPage = () => {};
-const currentChange = () => {};
+// 多少条
+const sizeChange = (val) => {
+  pageSize.value=val
+  onLoad();
+};
+// 多少页
+const currentChange = (val) => {
+  current.value=val
+  onLoad();
+};
+const searchChangeS=()=>{
+  onLoad();
+}
+// 顶部搜索
+const searchChange=()=>{
+onLoad(queryTop.value)
+}
 // 分类编辑
 const ClassificationDditing = val => {
   console.log(val);
@@ -261,6 +321,10 @@ const BatchDelete = () => {
       loadingclassification.value = false; //关闭加载效果
     });
 };
+// 放大镜搜索
+const searchHide=()=>{
+  search.value = ! search.value
+}
 // 分类删除
 const CategoryDeletion = val => {
   ElMessageBox.confirm(`是否删除${val.row.name}分类?`, 'Warning', {
@@ -396,4 +460,39 @@ const PointsManagementFn=()=>{
     cursor: pointer;
   }
 }
+:deep(.el-card) {
+  height: 100% !important;
+  .el-card__body {
+    height: 100%;
+    .content_max {
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+      .el-fy {
+        flex: 1;
+        display: flex;
+        align-items: flex-end;
+        margin-bottom: 10px;
+      }
+    }
+  }
+}
+.el-fr-d{
+  width: 100%;
+    display: flex;
+    justify-content: space-between;
+    :deep(.el_left_input){
+   
+      .el-form-item{
+        margin: 4px 0;
+      margin-right: 10px;
+      }
+    }
+    .el-btn{
+      margin-right: 0;
+    }
+}
+.maboxhi{
+  height: 700px !important;
+}
 </style>