From 1f92e42f9bd6fcb98eeb01fd4465c8c41975fe60 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 25 Jan 2024 18:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E9=85=8D=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/classify/classify.js                  |  29 +++
 src/option/supervise/supervise.js             |  49 ++---
 .../turndelivery/deliveryDiscuss.vue          |   9 +-
 src/views/supervise/IndicatorList.vue         | 193 ++++++++++++------
 src/views/supervise/classify.vue              |  11 +-
 src/views/supervise/management.vue            | 168 +++++++++++----
 vite.config.js                                |   4 +-
 7 files changed, 324 insertions(+), 139 deletions(-)

diff --git a/src/api/classify/classify.js b/src/api/classify/classify.js
index dde9bc00..67eac8af 100644
--- a/src/api/classify/classify.js
+++ b/src/api/classify/classify.js
@@ -44,3 +44,32 @@ export const $_classifyAddChild = (data) => {
       data
     })
   }
+// 指标管理编辑
+export const $_classifupdateChild = (data) => {
+  return request({
+    url: '/api/logpm-supervise/classify/updateChild',
+    method: 'post',
+    data
+  })
+}
+
+
+
+// 指标列表list
+export const $_findIndicatorsList = (data) => {
+  return request({
+    url: '/api/logpm-supervise/indicators/findIndicatorsList',
+    method: 'post',
+    data
+  })
+}
+
+
+// 指标列表查询详情
+export const $_findIndicatorsDetail = (data) => {
+  return request({
+    url: '/api/logpm-supervise/indicators/findIndicatorsDetail',
+    method: 'post',
+    data
+  })
+}
\ No newline at end of file
diff --git a/src/option/supervise/supervise.js b/src/option/supervise/supervise.js
index 6b6001a4..f5f28ac7 100644
--- a/src/option/supervise/supervise.js
+++ b/src/option/supervise/supervise.js
@@ -90,18 +90,7 @@ export const IndicatorColumnList = [
     fixed: true,
   },
   {
-    prop: 'name',
-    label: '指标编号',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'description',
+    prop: 'classifyName',
     label: '指标名称',
     type: 1,
     values: '',
@@ -112,7 +101,7 @@ export const IndicatorColumnList = [
     head: false,
   },
   {
-    prop: 'description',
+    prop: 'parentClassifyName',
     label: '指标分类',
     type: 1,
     values: '',
@@ -124,7 +113,7 @@ export const IndicatorColumnList = [
   },
 
   {
-    prop: 'createTime',
+    prop: 'assessDeptName',
     label: '考核部门',
     type: 1,
     values: '',
@@ -135,7 +124,7 @@ export const IndicatorColumnList = [
     head: false,
   },
   {
-    prop: 'createTime',
+    prop: 'point',
     label: '考核分数',
     type: 1,
     values: '',
@@ -146,7 +135,7 @@ export const IndicatorColumnList = [
     head: false,
   },
   {
-    prop: 'createTime',
+    prop: 'objectionRemark',
     label: '描述',
     type: 1,
     values: '',
@@ -157,9 +146,9 @@ export const IndicatorColumnList = [
     head: false,
   },
   {
-    prop: 'createTime',
-    label: '照片',
-    type: 1,//7
+    prop: 'assessUserName',
+    label: '考核人',
+    type: 1,
     values: '',
     width: '130',
     checkarr: [],
@@ -169,7 +158,7 @@ export const IndicatorColumnList = [
   },
   {
     prop: 'createTime',
-    label: '附件',
+    label: '考评时间',
     type: 1,
     values: '',
     width: '130',
@@ -179,8 +168,8 @@ export const IndicatorColumnList = [
     head: false,
   },
   {
-    prop: 'createTime',
-    label: '考核人',
+    prop: 'indicatorsStatus',
+    label: '指标状态',
     type: 1,
     values: '',
     width: '130',
@@ -189,9 +178,10 @@ export const IndicatorColumnList = [
     sortable: true,
     head: false,
   },
+  
   {
-    prop: 'createTime',
-    label: '考评事件',
+    prop: 'isObjection',
+    label: '是否存在异议',//1 表示提交 2 表示审核 通过 3 表示审核失败
     type: 1,
     values: '',
     width: '130',
@@ -200,6 +190,17 @@ export const IndicatorColumnList = [
     sortable: true,
     head: false,
   },
+  // {
+  //   prop: 'objectionRemark',
+  //   label: '异议备注',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
   {
     prop: '',
     label: '操作',
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 9a16d08e..27218cd6 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -2167,7 +2167,7 @@ const PackageFn = async () => {
 };
 
 // 查看包件事件
-const ViewEvent = (val,index) => {
+function ViewEvent  (val,index) {
   console.log(index,'下标')
   wrapData.value = [];
   loading.value = true; //开启加载效果
@@ -2322,8 +2322,11 @@ const isZeroNumber = val => {
 };
 // 刷新功能触发事件
 const refresh = () => {
-  onLoad();
-  //   loading.value = !loading.value;
+  if(!wrapLoading.value){
+    AddInfo()
+  }else{
+    ViewEvent(Packageow.value)
+  }
 };
 // 搜索展开功能
 const search = () => {
diff --git a/src/views/supervise/IndicatorList.vue b/src/views/supervise/IndicatorList.vue
index 6fc8845c..98f6a4a3 100644
--- a/src/views/supervise/IndicatorList.vue
+++ b/src/views/supervise/IndicatorList.vue
@@ -8,40 +8,50 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="searchFrom" class="el-fr-d">
           <!-- 查询按钮 -->
-          <div class="el_seaTop"> 
-          <el-form-item label="考核部门：">
-            <el-select v-model="searchFrom.a" class="m-2" placeholder="请选择考核部门" style="width: 240px">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
+          <div class="el_seaTop">
+            <el-form-item label="考核部门：">
+              <el-select
+                v-model="searchFrom.a"
+                class="m-2"
+                placeholder="请选择考核部门"
+                style="width: 240px"
+              >
+                <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="searchFrom.b" class="m-2" placeholder="请选择指标类型" style="width: 240px">
-              <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="searchFrom.b"
+                class="m-2"
+                placeholder="请选择指标类型"
+                style="width: 240px"
+              >
+                <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-date-picker
-              v-model="searchFrom.c"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :size="size"
-            />
-          </el-form-item>
-        </div>
+            <el-form-item label="填写时间：">
+              <el-date-picker
+                v-model="searchFrom.c"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :size="size"
+              />
+            </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> -->
@@ -128,12 +138,12 @@
         class="el_listForm"
       >
         <el-form-item label="指标名称">
-          <el-input v-model="lassificationform.name" placeholder="暂无" />
+          <el-input v-model="lassificationform.classifyName" placeholder="暂无" />
         </el-form-item>
 
         <el-form-item label="指标分类">
           <el-input
-            v-model="lassificationform.description"
+            v-model="lassificationform.parentClassifyName"
             :rows="2"
             type="textarea"
             placeholder="暂无"
@@ -141,15 +151,15 @@
         </el-form-item>
 
         <el-form-item label="考核部门">
-          <el-input v-model="lassificationform.name" placeholder="暂无" />
+          <el-input v-model="lassificationform.assessDeptName" placeholder="暂无" />
         </el-form-item>
 
         <el-form-item label="考核分数">
-          <el-input v-model="lassificationform.name" placeholder="暂无" />
+          <el-input v-model="lassificationform.point" placeholder="暂无" />
         </el-form-item>
 
         <el-form-item label="描述">
-          <el-input v-model="lassificationform.name" placeholder="暂无" />
+          <el-input v-model="lassificationform.objectionRemark" placeholder="暂无" />
         </el-form-item>
 
         <el-form-item label="附件">
@@ -157,13 +167,30 @@
         </el-form-item>
 
         <el-form-item label="考核人">
-          <el-input v-model="lassificationform.name" placeholder="暂无" />
+          <el-input v-model="lassificationform.assessUserName" placeholder="暂无" />
         </el-form-item>
 
         <el-form-item label="考评时间">
-          <el-input v-model="lassificationform.name" placeholder="暂无" />
+          <el-input v-model="lassificationform.createTime" placeholder="暂无" />
+        </el-form-item>
+        <el-form-item label="是否异议">
+          <!-- /1 表示提交 2 表示审核 通过 3 表示审核失败 -->
+          <el-input
+            v-model="lassificationform.isObjection"
+            placeholder="
+            暂无
+            "
+          />
+        </el-form-item>
+        <el-form-item label="指标状态">
+          <!-- /1 表示提交 2 表示审核 通过 3 表示审核失败 -->
+          <el-input
+            v-model="lassificationform.isObjection"
+            placeholder="
+            暂无
+            "
+          />
         </el-form-item>
-        <el-form-item> </el-form-item>
         <el-form-item label="照片">
           <div class="demo-image__preview">
             <el-image
@@ -188,6 +215,17 @@
         </span>
       </template>
     </el-dialog>
+
+    <!-- 编辑弹窗 -->
+
+    <el-dialog v-model="IndicatorEditing" title="Tips" width="40%">
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="IndicatorEditing = false">关闭</el-button>
+          <el-button type="primary" @click="IndicatorEditingFn"> 确定 </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </basic-container>
 
   <!-- 列表配置显示 -->
@@ -208,16 +246,19 @@ import {
   $_newlyadded,
   $_newlyremove,
   $_classifyAddChild,
+  $_findIndicatorsList,
+  $_findIndicatorsDetail,
 } from '@/api/classify/classify';
 const loadingclassification = ref(false); //指标分类加载效果
 const classificationdata = ref([]); //指标分类数据
 const current = ref(1); //当前页
 const total = ref(10); //总页数
+const IndicatorEditing = ref(false); //编辑弹窗
 const pageSize = ref(50);
 const lassificationform = ref({}); //分类表单
 const title = ref(true); //标题
 const EditID = ref(true); //编辑需要的ID
-const newlyAdded = ref(true); //新增弹窗
+const newlyAdded = ref(false); //新增弹窗
 const loadingAddPopup = ref(false); //弹窗加载
 const selectionList = ref([]); //选中数据
 const searchFrom = ref({}); //搜索表单
@@ -236,24 +277,20 @@ const onLoad = () => {
   let data = {
     current: current.value,
     size: pageSize.value,
-    isPid: 1,
   };
   loadingclassification.value = true; //开启加载效果
-  $_Getclassify(data)
+  $_findIndicatorsList(data)
     .then(res => {
       console.log(res);
       if (res.data.data.records) {
         classificationdata.value = res.data.data.records; //数据
-      } else {
       }
-
       total.value = res.data.data.total; //总页数
     })
     .catch(res => {})
     .finally(() => {
       loadingclassification.value = false; //开启加载效果
     });
-  classificationdata.value = [{}];
 };
 onLoad();
 // 页码
@@ -264,9 +301,7 @@ const currentChange = () => {};
 const ClassificationDditing = val => {
   EditID.value = val.row.id; //编辑需要的ID
   let data = val.row;
-  lassificationform.value.name = data.name; //分类名称
-  lassificationform.value.description = data.description; //分类描述
-  lassificationform.value.remark = data.remark; //分类备注
+  IndicatorEditing.value = true; //编辑弹窗展开
 };
 
 // 分类新增按钮
@@ -337,7 +372,6 @@ const CategoryDeletion = val => {
 };
 // 新增/编辑分类
 const newlyAddedFn = () => {
-  loadingAddPopup.value = true; //开启弹窗加载效果
   loadingclassification.value = true; //开启加载效果
   let data = {
     ...lassificationform.value,
@@ -379,11 +413,42 @@ const searchHide = () => {
 //  查看信息
 const ClassificationIndicatorView = val => {
   console.log(val, '查看信息');
+  newlyAdded.value = true; //开启弹窗
+  $_findIndicatorsDetail({ id: val.row.id })
+    .then(res => {
+      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='存在'
+      if (res.data.data.pictures.length) {
+        // 图片
+        res.data.data.pictures.forEach(res => {
+          srcList.value.push(res.url);
+        });
+      }
+    })
+    .catch(res => {})
+    .finally(() => {
+      loadingAddPopup.value = false; //关闭弹窗加载效果
+    });
 };
+// 编辑信息
+const IndicatorEditingFn = () => {};
 // 查询搜索
-const searchChange=()=>{
-
-}
+const searchChange = () => {};
 </script>
 
 <style scoped lang="scss">
@@ -419,21 +484,21 @@ const searchChange=()=>{
   width: 100%;
   height: 200px;
 }
-.el_header_top{
-    .el-form{
+.el_header_top {
+  .el-form {
     display: flex;
     justify-content: space-between;
     width: 100%;
-    .el-form-item{
-        margin: 4px 0;
-        margin-right: 10px;
-    }
-    .el-btn{
-        margin-right: 0;
-    }
+    .el-form-item {
+      margin: 4px 0;
+      margin-right: 10px;
     }
-    :deep(.el-date-editor){
-        height: 100% !important;
+    .el-btn {
+      margin-right: 0;
     }
+  }
+  :deep(.el-date-editor) {
+    height: 100% !important;
+  }
 }
 </style>
diff --git a/src/views/supervise/classify.vue b/src/views/supervise/classify.vue
index c6e4f427..cb000c2f 100644
--- a/src/views/supervise/classify.vue
+++ b/src/views/supervise/classify.vue
@@ -1,9 +1,7 @@
 <template>
   <basic-container>
     <!-- 首页表格 -->
-    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="分类列表" name="first"> </el-tab-pane>
-    </el-tabs>
+
     <div class="avue-crud">
       <!-- 搜索模块 -->
       <el-row v-if="search">
@@ -242,14 +240,17 @@ const CategoryDeletion = val => {
             message: res.data.msg,
             type: 'success',
           });
+          onLoad();
         })
         .catch(res => {})
         .finally(() => {
           loadingclassification.value = false; //关闭加载效果
         });
-      onLoad();
+     
     })
-    .catch(() => {});
+    .catch(() => {}).finally(()=>{
+      loadingclassification.value = false; //关闭加载效果
+    });
 };
 // 新增/编辑分类
 const newlyAddedFn = () => {
diff --git a/src/views/supervise/management.vue b/src/views/supervise/management.vue
index e6a70702..9121e00f 100644
--- a/src/views/supervise/management.vue
+++ b/src/views/supervise/management.vue
@@ -1,9 +1,7 @@
 <template>
   <basic-container>
     <!-- 首页表格 -->
-    <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="分类列表" name="first"> </el-tab-pane>
-    </el-tabs>
+
     <div class="avue-crud">
       <!-- 搜索模块 -->
       <el-row v-if="search">
@@ -88,12 +86,17 @@
     <el-dialog v-model="newlyAdded" :title="title ? '新增指标' : '编辑指标'" width="30%">
       <el-form v-loading="loadingAddPopup" :model="lassificationform" label-width="120px">
         <el-form-item label="指标分类">
-          <el-select v-model="classificationoptionsvalue" filterable placeholder="请选择指标分类" style="width: 240px">
+          <el-select
+            v-model="lassificationform.classificationoptionsvalue"
+            filterable
+            placeholder="请选择指标分类"
+            style="width:100%"
+          >
             <el-option
               v-for="item in classificationoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
             />
           </el-select>
         </el-form-item>
@@ -110,6 +113,18 @@
             placeholder="请输入指标描述"
           />
         </el-form-item>
+        <div class="el_integral">
+          <el-form-item label="积分值">
+            <el-input-number
+              v-for="item in PointsList"
+              v-model="item.integral"
+              class="mx-4"
+              controls-position="right"
+              @change="handleChange"
+            />
+          </el-form-item>
+          <div class="el_add" @click="integralAdd">+</div>
+        </div>
       </el-form>
       <template #footer>
         <span class="dialog-footer">
@@ -120,6 +135,9 @@
         </span>
       </template>
     </el-dialog>
+
+
+
   </basic-container>
 
   <!-- 列表配置显示 -->
@@ -135,7 +153,14 @@
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { ref, reactive, computed, onMounted } from 'vue';
 import { classificationColumnList } from '@/option/supervise/supervise.js';
-import { $_Getclassify, $_newlyadded, $_newlyremove,$_selectParentCalssifyList } from '@/api/classify/classify';
+import {
+  $_Getclassify,
+  $_newlyadded,
+  $_newlyremove,
+  $_selectParentCalssifyList,
+  $_classifyAddChild,
+  $_classifupdateChild,
+} from '@/api/classify/classify';
 const loadingclassification = ref(false); //指标分类加载效果
 const classificationdata = ref([]); //指标分类数据
 const current = ref(1); //当前页
@@ -147,8 +172,9 @@ const EditID = ref(true); //编辑需要的ID
 const newlyAdded = ref(false); //新增弹窗
 const loadingAddPopup = ref(false); //弹窗加载
 const selectionList = ref([]); //选中数据
-const classificationoptions= ref([]);//指标分类接口
-const classificationoptionsvalue = ref([]);//分类选择的
+const classificationoptions = ref([]); //指标分类接口
+const classificationoptionsvalue = ref([]); //分类选择的
+const PointsList = ref([{ integral: 0 }]); //积分列表
 const onLoad = () => {
   let data = {
     current: current.value,
@@ -166,12 +192,12 @@ const onLoad = () => {
     .finally(() => {
       loadingclassification.value = false; //开启加载效果
     });
-    // 获取分类
-    $_selectParentCalssifyList().then(res=>{
-        console.log(res,'指标分类');
-        classificationoptions.value   =  res.data.data.records
-    })
-
+  // 获取分类
+  $_selectParentCalssifyList().then(res => {
+    console.log(res, '指标分类');
+    classificationoptions.value = res.data.data;
+    console.log(classificationoptions.value, '存储的指标');
+  });
 };
 onLoad();
 // 页码
@@ -180,13 +206,19 @@ const currentPage = () => {};
 const currentChange = () => {};
 // 分类编辑
 const ClassificationDditing = val => {
+  console.log(val);
   EditID.value = val.row.id; //编辑需要的ID
   title.value = false; //关闭编辑
   newlyAdded.value = true; //开启弹窗
+  PointsList.value=[];//重置积分
   let data = val.row;
+  lassificationform.value.classificationoptionsvalue = data.pid; //分类
   lassificationform.value.name = data.name; //分类名称
   lassificationform.value.description = data.description; //分类描述
-  lassificationform.value.remark = data.remark; //分类备注
+  // 积分管理回显
+  data.pointsEntities.forEach(res=>{
+    PointsList.value.push({integral:res.point})   
+  })
 };
 
 // 分类新增按钮
@@ -194,6 +226,7 @@ const AddCategory = () => {
   title.value = true; //开启新增
   newlyAdded.value = true; //开启编辑
   lassificationform.value = {}; //重置表单
+  PointsList.value=[{integral:0}];//重置积分
 };
 
 // 批量删除分类
@@ -237,7 +270,6 @@ const CategoryDeletion = val => {
   })
     .then(() => {
       loadingclassification.value = true; //开启加载效果
-      console.log(val, '分类删除');
       let data = {
         ids: [],
       };
@@ -250,52 +282,86 @@ const CategoryDeletion = val => {
             message: res.data.msg,
             type: 'success',
           });
+          onLoad();
         })
         .catch(res => {})
         .finally(() => {
           loadingclassification.value = false; //关闭加载效果
         });
-      onLoad();
     })
     .catch(() => {});
 };
-// 新增/编辑分类
+// 新增分类
 const newlyAddedFn = () => {
-  loadingAddPopup.value = true; //开启弹窗加载效果
-  loadingclassification.value = true; //开启加载效果
   let data = {
-    ...lassificationform.value,
-    pId: 0, ///是否父指标 默认0
-  };
+      name: lassificationform.value.name, //分类名称
+      description: lassificationform.value.description, //分类描述
+      pid: lassificationform.value.classificationoptionsvalue,//分类ID
+      pointsEntities: [], //积分
+    };
+    loadingAddPopup.value = true; //关闭弹窗加载
   if (title.value) {
-    console.log(data, '新增分类');
+    // 新增
+    PointsList.value.forEach(res => {
+      data['pointsEntities'].push({ point: res.integral });
+    });
+    $_classifyAddChild(data)
+      .then(res => {
+        if (res.data.code == 200) {
+          newlyAdded.value = false; //关闭弹窗
+          ElMessage({
+            message: res.data.msg,
+            type: 'success',
+          });
+          onLoad();
+        }
+      })
+      .catch(res => {})
+      .finally(() => {
+        loadingAddPopup.value = false; //关闭弹窗加载
+      });
   } else {
-    data.id = EditID.value;
-  }
 
-  $_newlyadded(data)
-    .then(res => {
-      console.log(res, '新增成功返回值');
-      if (res.data.code == 200) {
-        onLoad();
+    // 编辑
+    data.id =EditID.value,//编辑需要的id
+    PointsList.value.forEach(res => {
+      data['pointsEntities'].push({ point: res.integral });
+    });
+    $_classifupdateChild(data).then(res=>{
+      console.log(res,'编辑成功');
+      if(res.data.code == 200){
         newlyAdded.value = false; //关闭弹窗
         ElMessage({
-          message: res.data.msg,
-          type: 'success',
-        });
+            message: res.data.msg,
+            type: 'success',
+          });
+          onLoad();
       }
+    }).catch(res=>{
+
+    }).finally(()=>{
+      loadingAddPopup.value = false; //关闭弹窗加载
     })
-    .catch(res => {})
-    .finally(() => {
-      loadingAddPopup.value = false; //关闭弹窗加载效果
-      loadingclassification.value = false; //关闭加载效果
-    });
+    
+  }
 };
 // 表格选择
 const selectionChange = list => {
   selectionList.value = list;
   console.log(selectionList.value, '已经选中的数据');
 };
+// 积分新增
+const integralAdd = () => {
+  PointsList.value.push({ integral: 0 });
+};
+// 积分编辑按钮
+const IntegralEditing=()=>{
+
+}
+// 积分新增确定
+const PointsManagementFn=()=>{
+
+}
 </script>
 
 <style scoped lang="scss">
@@ -310,4 +376,24 @@ const selectionChange = list => {
   display: flex;
   justify-content: space-evenly;
 }
+:deep(.el_integral) {
+  display: flex;
+  .el-form-item {
+    width: 100% !important;
+    margin-right: 0;
+    .el-input-number {
+      width: 100%;
+      margin-bottom: 14px;
+    }
+  }
+  .el_add {
+    font-size: 20px;
+    width: 24px;
+    height: 24px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
+  }
+}
 </style>
diff --git a/vite.config.js b/vite.config.js
index bd75ffdc..94543071 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,8 +23,8 @@ export default ({ mode, command }) => {
           // 新zyc
           // target: 'http://192.168.6.116:8777',
           // target: 'http://192.168.6.122:8777',
-          target: 'http://192.168.10.57:13000',
-          // target: 'http://192.168.10.25:2888', 
+          // target: 'http://192.168.10.57:13000',
+          target: 'http://192.168.10.25:13000', 
           // target: 'http://192.168.6.169:9777',//CYZ  
           // target: 'http://192.168.10.57:13000',
           // target: 'http://192.168.10.200:13000',