diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index f573fd8..bed5935 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -21,7 +21,12 @@
             placeholder="请选择服务类型"
             style="width: 200px"
           >
-            <el-option v-for="item in options" :key="item.id" :label="item.typeName" :value="item.typeCode" />
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.typeName"
+              :value="item.typeCode"
+            />
           </el-select>
         </div>
       </div>
@@ -34,7 +39,14 @@
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -47,7 +59,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -64,6 +76,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -75,18 +88,10 @@
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -117,100 +122,141 @@
 
 <script>
 // 组件
-import ManagementAddDialog from '../../components/mycomponent/dialog/server/managementAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ManagementAddDialog from "../../components/mycomponent/dialog/server/managementAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { listPage, M_batchDelete, M_delete } from '../../api/server/Management'
-import { TM_list } from '../../api/server/TypeManagement'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { listPage, M_batchDelete, M_delete } from "../../api/server/Management";
+import { TM_list } from "../../api/server/TypeManagement";
 
 export default {
   components: {
     ManagementAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        serviceName: '',
-        typeCode: ''
+        serviceName: "",
+        typeCode: "",
       },
       options: [],
-      title: ''
-    }
+      title: "",
+      loading:false
+    };
   },
   mounted() {
-    TM_list().then(res => {
-      console.log(res)
-      this.options = res
-    })
+    TM_list().then((res) => {
+      console.log(res);
+      this.options = res;
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.title = '服务新增'
-      this.isShowAdd = true
-      this.rowInfo = ''
+      this.title = "服务新增";
+      this.isShowAdd = true;
+      this.rowInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+        id: "",
+      };
     },
     handleClick(row) {
-      this.title = '服务编辑'
-      this.isShowAdd = true
-      console.log(row)
-      this.rowInfo = row
+      this.title = "服务编辑";
+      this.isShowAdd = true;
+      console.log(row);
+      this.rowInfo = row;
+    },
+    reset() {
+      // 重置
+      this.selectInfo = {
+        serviceName: "",
+        typeCode: "",
+      };
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      M_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            M_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      M_delete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          M_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -252,7 +298,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index f573fd8..bed5935 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -21,7 +21,12 @@
             placeholder="请选择服务类型"
             style="width: 200px"
           >
-            <el-option v-for="item in options" :key="item.id" :label="item.typeName" :value="item.typeCode" />
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.typeName"
+              :value="item.typeCode"
+            />
           </el-select>
         </div>
       </div>
@@ -34,7 +39,14 @@
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -47,7 +59,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -64,6 +76,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -75,18 +88,10 @@
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -117,100 +122,141 @@
 
 <script>
 // 组件
-import ManagementAddDialog from '../../components/mycomponent/dialog/server/managementAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ManagementAddDialog from "../../components/mycomponent/dialog/server/managementAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { listPage, M_batchDelete, M_delete } from '../../api/server/Management'
-import { TM_list } from '../../api/server/TypeManagement'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { listPage, M_batchDelete, M_delete } from "../../api/server/Management";
+import { TM_list } from "../../api/server/TypeManagement";
 
 export default {
   components: {
     ManagementAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        serviceName: '',
-        typeCode: ''
+        serviceName: "",
+        typeCode: "",
       },
       options: [],
-      title: ''
-    }
+      title: "",
+      loading:false
+    };
   },
   mounted() {
-    TM_list().then(res => {
-      console.log(res)
-      this.options = res
-    })
+    TM_list().then((res) => {
+      console.log(res);
+      this.options = res;
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.title = '服务新增'
-      this.isShowAdd = true
-      this.rowInfo = ''
+      this.title = "服务新增";
+      this.isShowAdd = true;
+      this.rowInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+        id: "",
+      };
     },
     handleClick(row) {
-      this.title = '服务编辑'
-      this.isShowAdd = true
-      console.log(row)
-      this.rowInfo = row
+      this.title = "服务编辑";
+      this.isShowAdd = true;
+      console.log(row);
+      this.rowInfo = row;
+    },
+    reset() {
+      // 重置
+      this.selectInfo = {
+        serviceName: "",
+        typeCode: "",
+      };
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      M_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            M_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      M_delete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          M_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -252,7 +298,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/server/TypeManagement.vue b/src/views/server/TypeManagement.vue
index 4fe0cab..c13185a 100644
--- a/src/views/server/TypeManagement.vue
+++ b/src/views/server/TypeManagement.vue
@@ -5,21 +5,41 @@
       <div class="serveInput">
         服务类型名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.typeName" placeholder="请输入服务类型名称" clearable class="serve-input" />
+          <el-input
+            v-model="selectInfo.typeName"
+            placeholder="请输入服务类型名称"
+            clearable
+            class="serve-input"
+          />
         </div>
       </div>
       <div class="serveBtn">
         <!-- <el-button type="primary" class="btnItem">查询</el-button>
         <el-button type="success" class="btnItem bggreen" @click="addCategory">新增</el-button>
         <el-button type="danger" class="btnItem bgred">删除</el-button> -->
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
 
-        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
+        <el-button
+          type="success"
+          icon="el-icon-circle-plus-outline"
+          class="btnItem bggreen"
+          @click="addCategory"
+        >
           新增
         </el-button>
-        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
+        <el-button
+          type="danger"
+          icon="el-icon-delete-solid"
+          class="btnItem bgred"
+          @click="BatchDelete"
+        >
           删除
         </el-button>
       </div>
@@ -35,9 +55,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" :index="indexMethod" label="序号" width="55" />
+      <el-table-column
+        type="index"
+        :index="indexMethod"
+        label="序号"
+        width="55"
+      />
       <el-table-column prop="typeCode" label="服务类型编号" />
       <el-table-column prop="typeName" label="服务类型名称" />
       <el-table-column prop="description" label="描述" />
@@ -71,101 +97,148 @@
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog ></brand-add-dialog> -->
-    <typeAddDialog v-if="isShowAdd" :title="dialoaTitle" :data-info="dataInfo" @close="closeAdd" @refresh="refresh" />
+    <typeAddDialog
+      v-if="isShowAdd"
+      :title="dialoaTitle"
+      :data-info="dataInfo"
+      @close="closeAdd"
+      @refresh="refresh"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import typeAddDialog from '../../components/mycomponent/dialog/server/typeAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import typeAddDialog from "../../components/mycomponent/dialog/server/typeAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage, typeDelete, batchDelete } from '../../api/server/TypeManagement'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import {
+  listPage,
+  typeDelete,
+  batchDelete,
+} from "../../api/server/TypeManagement";
+export default {
+  // 加入分页逻辑
   components: {
-    typeAddDialog, GroupPage
+    typeAddDialog,
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       dataInfo: {},
       selectInfo: {
-        typeName: ''
+        typeName: "",
       },
-      dialoaTitle: '',
-      isShowAdd: false // 显示新增功能
-    }
+      dialoaTitle: "",
+      isShowAdd: false, // 显示新增功能
+      loading: false,
+    };
   },
   methods: {
     // 生成序号
     indexMethod(index) {
-      return index + 1
+      return index + 1;
     },
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addCategory() {
-      this.isShowAdd = true
-      this.dialoaTitle = '新增服务类型'
+      this.isShowAdd = true;
+      this.dialoaTitle = "新增服务类型";
+      this.dataInfo = {
+        typeCode: "", // 服务类型编号
+        typeName: "", // 服务类型名称
+        description: "", // 描述
+        remark: "", // 备注
+        qualifyIds: [""], // 资质要求
+      };
     },
     handleClick(row) {
-      console.log(row)
-      this.isShowAdd = true
-      this.dialoaTitle = '编辑'
-      this.dataInfo = row
+      console.log(row);
+      this.isShowAdd = true;
+      this.dialoaTitle = "编辑";
+      this.dataInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      this.loading = true;
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo)
+        .then((res) => {
+          console.log(res);
+          this.tableData = res;
+          this.loading = false;
+        })
+        .catch((err) => {
+          this.loading = false;
+        });
     },
     dealAry(scope) {
-      const ary = scope.row.qualifys.map(item => {
-        return item.qualifyName
-      })
-      let str = ''
+      const ary = scope.row.qualifys.map((item) => {
+        return item.qualifyName;
+      });
+      let str = "";
       for (let i = 0; i < ary.length; i++) {
-        str += ary[i]
+        str += ary[i];
       }
-      return str
+      return str;
     },
     Bdelete(row) {
-      const id = row.id
-      typeDelete({ id: id }).then(res => {
-        console.log(res)
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务类型吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          const id = row.id;
+          typeDelete({ id: id }).then((res) => {
+            console.log(res);
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
     },
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的服务类型吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              if (res != "") {
+                this.$message({
+                  message: "删除成功",
+                  type: "success",
+                });
+                this.refresh();
+              }
+            });
           })
-          this.refresh()
-        }
-      })
-    }
-  }
-}
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务类型",
+          type: "error",
+        });
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index f573fd8..bed5935 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -21,7 +21,12 @@
             placeholder="请选择服务类型"
             style="width: 200px"
           >
-            <el-option v-for="item in options" :key="item.id" :label="item.typeName" :value="item.typeCode" />
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.typeName"
+              :value="item.typeCode"
+            />
           </el-select>
         </div>
       </div>
@@ -34,7 +39,14 @@
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -47,7 +59,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -64,6 +76,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -75,18 +88,10 @@
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -117,100 +122,141 @@
 
 <script>
 // 组件
-import ManagementAddDialog from '../../components/mycomponent/dialog/server/managementAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ManagementAddDialog from "../../components/mycomponent/dialog/server/managementAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { listPage, M_batchDelete, M_delete } from '../../api/server/Management'
-import { TM_list } from '../../api/server/TypeManagement'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { listPage, M_batchDelete, M_delete } from "../../api/server/Management";
+import { TM_list } from "../../api/server/TypeManagement";
 
 export default {
   components: {
     ManagementAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        serviceName: '',
-        typeCode: ''
+        serviceName: "",
+        typeCode: "",
       },
       options: [],
-      title: ''
-    }
+      title: "",
+      loading:false
+    };
   },
   mounted() {
-    TM_list().then(res => {
-      console.log(res)
-      this.options = res
-    })
+    TM_list().then((res) => {
+      console.log(res);
+      this.options = res;
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.title = '服务新增'
-      this.isShowAdd = true
-      this.rowInfo = ''
+      this.title = "服务新增";
+      this.isShowAdd = true;
+      this.rowInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+        id: "",
+      };
     },
     handleClick(row) {
-      this.title = '服务编辑'
-      this.isShowAdd = true
-      console.log(row)
-      this.rowInfo = row
+      this.title = "服务编辑";
+      this.isShowAdd = true;
+      console.log(row);
+      this.rowInfo = row;
+    },
+    reset() {
+      // 重置
+      this.selectInfo = {
+        serviceName: "",
+        typeCode: "",
+      };
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      M_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            M_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      M_delete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          M_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -252,7 +298,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/server/TypeManagement.vue b/src/views/server/TypeManagement.vue
index 4fe0cab..c13185a 100644
--- a/src/views/server/TypeManagement.vue
+++ b/src/views/server/TypeManagement.vue
@@ -5,21 +5,41 @@
       <div class="serveInput">
         服务类型名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.typeName" placeholder="请输入服务类型名称" clearable class="serve-input" />
+          <el-input
+            v-model="selectInfo.typeName"
+            placeholder="请输入服务类型名称"
+            clearable
+            class="serve-input"
+          />
         </div>
       </div>
       <div class="serveBtn">
         <!-- <el-button type="primary" class="btnItem">查询</el-button>
         <el-button type="success" class="btnItem bggreen" @click="addCategory">新增</el-button>
         <el-button type="danger" class="btnItem bgred">删除</el-button> -->
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
 
-        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
+        <el-button
+          type="success"
+          icon="el-icon-circle-plus-outline"
+          class="btnItem bggreen"
+          @click="addCategory"
+        >
           新增
         </el-button>
-        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
+        <el-button
+          type="danger"
+          icon="el-icon-delete-solid"
+          class="btnItem bgred"
+          @click="BatchDelete"
+        >
           删除
         </el-button>
       </div>
@@ -35,9 +55,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" :index="indexMethod" label="序号" width="55" />
+      <el-table-column
+        type="index"
+        :index="indexMethod"
+        label="序号"
+        width="55"
+      />
       <el-table-column prop="typeCode" label="服务类型编号" />
       <el-table-column prop="typeName" label="服务类型名称" />
       <el-table-column prop="description" label="描述" />
@@ -71,101 +97,148 @@
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog ></brand-add-dialog> -->
-    <typeAddDialog v-if="isShowAdd" :title="dialoaTitle" :data-info="dataInfo" @close="closeAdd" @refresh="refresh" />
+    <typeAddDialog
+      v-if="isShowAdd"
+      :title="dialoaTitle"
+      :data-info="dataInfo"
+      @close="closeAdd"
+      @refresh="refresh"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import typeAddDialog from '../../components/mycomponent/dialog/server/typeAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import typeAddDialog from "../../components/mycomponent/dialog/server/typeAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage, typeDelete, batchDelete } from '../../api/server/TypeManagement'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import {
+  listPage,
+  typeDelete,
+  batchDelete,
+} from "../../api/server/TypeManagement";
+export default {
+  // 加入分页逻辑
   components: {
-    typeAddDialog, GroupPage
+    typeAddDialog,
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       dataInfo: {},
       selectInfo: {
-        typeName: ''
+        typeName: "",
       },
-      dialoaTitle: '',
-      isShowAdd: false // 显示新增功能
-    }
+      dialoaTitle: "",
+      isShowAdd: false, // 显示新增功能
+      loading: false,
+    };
   },
   methods: {
     // 生成序号
     indexMethod(index) {
-      return index + 1
+      return index + 1;
     },
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addCategory() {
-      this.isShowAdd = true
-      this.dialoaTitle = '新增服务类型'
+      this.isShowAdd = true;
+      this.dialoaTitle = "新增服务类型";
+      this.dataInfo = {
+        typeCode: "", // 服务类型编号
+        typeName: "", // 服务类型名称
+        description: "", // 描述
+        remark: "", // 备注
+        qualifyIds: [""], // 资质要求
+      };
     },
     handleClick(row) {
-      console.log(row)
-      this.isShowAdd = true
-      this.dialoaTitle = '编辑'
-      this.dataInfo = row
+      console.log(row);
+      this.isShowAdd = true;
+      this.dialoaTitle = "编辑";
+      this.dataInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      this.loading = true;
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo)
+        .then((res) => {
+          console.log(res);
+          this.tableData = res;
+          this.loading = false;
+        })
+        .catch((err) => {
+          this.loading = false;
+        });
     },
     dealAry(scope) {
-      const ary = scope.row.qualifys.map(item => {
-        return item.qualifyName
-      })
-      let str = ''
+      const ary = scope.row.qualifys.map((item) => {
+        return item.qualifyName;
+      });
+      let str = "";
       for (let i = 0; i < ary.length; i++) {
-        str += ary[i]
+        str += ary[i];
       }
-      return str
+      return str;
     },
     Bdelete(row) {
-      const id = row.id
-      typeDelete({ id: id }).then(res => {
-        console.log(res)
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务类型吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          const id = row.id;
+          typeDelete({ id: id }).then((res) => {
+            console.log(res);
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
     },
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的服务类型吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              if (res != "") {
+                this.$message({
+                  message: "删除成功",
+                  type: "success",
+                });
+                this.refresh();
+              }
+            });
           })
-          this.refresh()
-        }
-      })
-    }
-  }
-}
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务类型",
+          type: "error",
+        });
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/server/operation.vue b/src/views/server/operation.vue
index 40d80ad..e9a9a10 100644
--- a/src/views/server/operation.vue
+++ b/src/views/server/operation.vue
@@ -6,7 +6,7 @@
         服务名称
         <div class="inputBox" style="width: 120px">
           <el-input
-            v-model="input"
+            v-model="selectInfo.input"
             placeholder="请输入服务名称"
             clearable
             class="product-input"
@@ -18,10 +18,18 @@
           type="primary"
           icon="el-icon-search"
           class="btnItem"
+          @click="selectData"
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -34,12 +42,14 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="BatchDelete"
         >
           删除
         </el-button>
       </div>
     </div>
     <el-table
+    ref="multipleTable"
       :data="tableData"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -49,6 +59,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="date1" label="序号" />
@@ -60,18 +71,10 @@
 
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -93,97 +96,170 @@
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog ></brand-add-dialog> -->
-    <operation-add-dialog
-      :is-show-info="isShowAdd"
-      @close="closeAdd"
-    />
+    <operation-add-dialog :is-show-info="isShowAdd" @close="closeAdd" />
   </div>
 </template>
 
 <script>
 // 组件
 // import BrandAddDialog from '../../components/mycomponent/dialog/brandAddDialog.vue';
-import OperationAddDialog from '../../components/mycomponent/dialog/server/operationAddDialog.vue'
-
+import OperationAddDialog from "../../components/mycomponent/dialog/server/operationAddDialog.vue";
+import { listPage, O_batchDelete, O_delete } from "../../api/server/operation";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
 
 export default {
   components: {
-    OperationAddDialog
+    OperationAddDialog,
   },
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       tableData: [
         {
-          date1: '1',
-          date: 'fwyy001',
-          name: '4年免费换新',
-          address: '129',
-          address1: '限时9折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "1",
+          date: "fwyy001",
+          name: "4年免费换新",
+          address: "129",
+          address1: "限时9折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '2',
-          date: 'fwyy002',
-          name: '5年免费换新',
-          address: '169',
-          address1: '限时9折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "2",
+          date: "fwyy002",
+          name: "5年免费换新",
+          address: "169",
+          address1: "限时9折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '3',
-          date: 'fwyy003',
-          name: '6年全面保修',
-          address: '94',
-          address1: '限时8折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "3",
+          date: "fwyy003",
+          name: "6年全面保修",
+          address: "94",
+          address1: "限时8折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '4',
-          date: 'fwyy004',
-          name: '7年免费换新',
-          address: '110',
-          address1: '限时8折',
-          address2: '2022/06/01-2022/06/15'
-        }
+          date1: "4",
+          date: "fwyy004",
+          name: "7年免费换新",
+          address: "110",
+          address1: "限时8折",
+          address2: "2022/06/01-2022/06/15",
+        },
       ],
       options: [
         {
-          value: '选项1',
-          label: '黄金糕'
+          value: "选项1",
+          label: "黄金糕",
         },
         {
-          value: '选项2',
-          label: '双皮奶'
+          value: "选项2",
+          label: "双皮奶",
         },
         {
-          value: '选项3',
-          label: '蚵仔煎'
+          value: "选项3",
+          label: "蚵仔煎",
         },
         {
-          value: '选项4',
-          label: '龙须面'
+          value: "选项4",
+          label: "龙须面",
         },
         {
-          value: '选项5',
-          label: '北京烤鸭'
-        }
+          value: "选项5",
+          label: "北京烤鸭",
+        },
       ],
-      value: ''
-    }
+      value: "",
+      selectInfo: {
+        input: "",
+      },
+      loading:false
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addCategory() {
-      this.isShowAdd = true
-    }
-  }
-}
+      this.isShowAdd = true;
+    },
+    reset() {
+      this.inpute = "";
+    },
+    // 获取指定页面
+    getListPage(limit, offset) {
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err =>{
+        this.loading = false
+      })
+    },
+    // 批量删除
+    BatchDelete() {
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            O_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+          })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
+    },
+    // 删除
+    Bdelete(row) {
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          O_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -225,7 +301,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }