diff --git a/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue b/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
index 4179b70..9b17937 100644
--- a/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
+++ b/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
@@ -7,27 +7,37 @@
     append-to-body
     @close="close"
   >
-    <el-form :inline="true" :model="cerInfo" class="demo-form-inline" :rules="rules" label-width="115px">
+    <el-form
+      :inline="true"
+      :model="cerInfo"
+      class="demo-form-inline"
+      :rules="rules"
+      label-width="115px"
+      ref="form"
+    >
       <div class="item">
         <el-form-item label="资质要求名称:" prop="qualifyName">
-          <el-input v-model="cerInfo.qualifyName" style="width:250px" />
+          <el-input v-model.trim="cerInfo.qualifyName" style="width: 250px" />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="资质要求描述:" prop="qualifyDesc">
-          <el-input v-model="cerInfo.qualifyDesc" style="width:250px" />
+          <el-input v-model.trim="cerInfo.qualifyDesc" style="width: 250px" />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="资质要求证明材料要求:" prop="proveMaterialDesc">
-          <el-input v-model="cerInfo.proveMaterialDesc" style="width:250px;" />
+          <el-input
+            v-model.trim="cerInfo.proveMaterialDesc"
+            style="width: 250px"
+          />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="备注:">
           <el-input
-            v-model="cerInfo.remark"
-            style="width:250px"
+            v-model.trim="cerInfo.remark"
+            style="width: 250px"
             type="textarea"
             :rows="3"
             placeholder="请输入内容"
@@ -36,10 +46,8 @@
       </div>
       <div class="item">
         <el-form-item class="btnBOX">
-          <el-button type="primary" @click="save">
-            保存
-          </el-button>
-          <el-button type="info" style="margin-left:100px" @click="close">
+          <el-button type="primary" @click="save"> 保存 </el-button>
+          <el-button type="info" style="margin-left: 100px" @click="close">
             取消
           </el-button>
         </el-form-item>
@@ -56,7 +64,7 @@
 // import { Message } from 'element-ui'
 // import { C_add,C_list,C_update,detail } from "../../../api/product/category"
 // import { getCertification } from '../../../api/systemNew/systemNew'
-import { add, update } from '../../../../api/system/certification'
+import { add, update } from "../../../../api/system/certification";
 export default {
   components: {
     // inputVue,
@@ -68,57 +76,55 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
     dataInfo: {
-      type: Object
+      type: Object,
     },
-    title: ''
+    title: "",
   },
   data() {
     return {
       // 品类信息
       cerInfo: {
-        qualifyName: '',
-        qualifyDesc: '',
-        proveMaterialDesc: '',
-        remark: ''
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
       },
       categoryList: [],
       // 资质列表
       certificationList: [],
 
       rules: {
-        empty: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
-        ],
+        empty: [{ required: true, message: "此内容不能为空", trigger: "blur" }],
         qualifyDesc: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
+          { required: true, message: "此内容不能为空", trigger: "blur" },
         ],
         proveMaterialDesc: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
-        ]
-      }
-    }
+          { required: true, message: "此内容不能为空", trigger: "blur" },
+        ],
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vla) {
-        if (vla != '') {
+        if (vla != "") {
           // 编辑操作
-          if (!vla.id) return
-          this.cerInfo.id = vla.id
-          this.cerInfo.qualifyName = vla.qualifyName
-          this.cerInfo.qualifyDesc = vla.qualifyDesc
-          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc
-          this.cerInfo.remark = vla.remark
+          if (!vla.id) return;
+          this.cerInfo.id = vla.id;
+          this.cerInfo.qualifyName = vla.qualifyName;
+          this.cerInfo.qualifyDesc = vla.qualifyDesc;
+          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc;
+          this.cerInfo.remark = vla.remark;
         } else {
-          this.resetData()
+          this.resetData();
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     // C_list().then((res) => {
@@ -131,56 +137,58 @@
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
       // 重置数据
       // this.resetData()
     },
     // 数据处理
     save() {
-      if (this.title == '新增资质要求') {
-        add(this.cerInfo).then((res) => {
-          console.log(res, res != '')
-          if (res != '') {
-            this.$message({
-              message: '保存成功',
-              type: 'success'
-            })
-            this.close()
-            // 保存后刷新数据
-            this.$emit('refresh')
+      console.log(this.$refs)
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.title == "新增资质要求") {
+            add(this.cerInfo).then((res) => {
+              console.log(res, res != "");
+              this.$message({
+                message: "保存成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
+          } else {
+            update(this.cerInfo).then((res) => {
+              this.$message({
+                message: "更新成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
           }
-        })
-      } else {
-        update(this.cerInfo).then((res) => {
-          if (res != '') {
-            this.$message({
-              message: '更新成功',
-              type: 'success'
-            })
-            this.close()
-            // 保存后刷新数据
-            this.$emit('refresh')
-          }
-        })
-      }
+        } else {
+          return false;
+        }
+      });
     },
     resetData() {
       this.cerInfo = {
-        qualifyName: '',
-        qualifyDesc: '',
-        proveMaterialDesc: '',
-        remark: ''
-      }
-    }
-  }
-}
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-
-.btnBOX{
-    display: flex;
-    justify-content: space-between;
+.btnBOX {
+  display: flex;
+  justify-content: space-between;
 }
 .categoryDialog {
   width: 800px;
@@ -222,9 +230,10 @@
         display: flex;
         align-items: center;
 
-         .label,.el-form-item.el-form-item__label{
-             line-height: 21px !important;
-                line-height:NONE
+        .label,
+        .el-form-item.el-form-item__label {
+          line-height: 21px !important;
+          line-height: NONE;
         }
       }
     }

diff --git a/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue b/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
index 4179b70..9b17937 100644
--- a/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
+++ b/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
@@ -7,27 +7,37 @@
     append-to-body
     @close="close"
   >
-    <el-form :inline="true" :model="cerInfo" class="demo-form-inline" :rules="rules" label-width="115px">
+    <el-form
+      :inline="true"
+      :model="cerInfo"
+      class="demo-form-inline"
+      :rules="rules"
+      label-width="115px"
+      ref="form"
+    >
       <div class="item">
         <el-form-item label="资质要求名称:" prop="qualifyName">
-          <el-input v-model="cerInfo.qualifyName" style="width:250px" />
+          <el-input v-model.trim="cerInfo.qualifyName" style="width: 250px" />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="资质要求描述:" prop="qualifyDesc">
-          <el-input v-model="cerInfo.qualifyDesc" style="width:250px" />
+          <el-input v-model.trim="cerInfo.qualifyDesc" style="width: 250px" />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="资质要求证明材料要求:" prop="proveMaterialDesc">
-          <el-input v-model="cerInfo.proveMaterialDesc" style="width:250px;" />
+          <el-input
+            v-model.trim="cerInfo.proveMaterialDesc"
+            style="width: 250px"
+          />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="备注:">
           <el-input
-            v-model="cerInfo.remark"
-            style="width:250px"
+            v-model.trim="cerInfo.remark"
+            style="width: 250px"
             type="textarea"
             :rows="3"
             placeholder="请输入内容"
@@ -36,10 +46,8 @@
       </div>
       <div class="item">
         <el-form-item class="btnBOX">
-          <el-button type="primary" @click="save">
-            保存
-          </el-button>
-          <el-button type="info" style="margin-left:100px" @click="close">
+          <el-button type="primary" @click="save"> 保存 </el-button>
+          <el-button type="info" style="margin-left: 100px" @click="close">
             取消
           </el-button>
         </el-form-item>
@@ -56,7 +64,7 @@
 // import { Message } from 'element-ui'
 // import { C_add,C_list,C_update,detail } from "../../../api/product/category"
 // import { getCertification } from '../../../api/systemNew/systemNew'
-import { add, update } from '../../../../api/system/certification'
+import { add, update } from "../../../../api/system/certification";
 export default {
   components: {
     // inputVue,
@@ -68,57 +76,55 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
     dataInfo: {
-      type: Object
+      type: Object,
     },
-    title: ''
+    title: "",
   },
   data() {
     return {
       // 品类信息
       cerInfo: {
-        qualifyName: '',
-        qualifyDesc: '',
-        proveMaterialDesc: '',
-        remark: ''
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
       },
       categoryList: [],
       // 资质列表
       certificationList: [],
 
       rules: {
-        empty: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
-        ],
+        empty: [{ required: true, message: "此内容不能为空", trigger: "blur" }],
         qualifyDesc: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
+          { required: true, message: "此内容不能为空", trigger: "blur" },
         ],
         proveMaterialDesc: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
-        ]
-      }
-    }
+          { required: true, message: "此内容不能为空", trigger: "blur" },
+        ],
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vla) {
-        if (vla != '') {
+        if (vla != "") {
           // 编辑操作
-          if (!vla.id) return
-          this.cerInfo.id = vla.id
-          this.cerInfo.qualifyName = vla.qualifyName
-          this.cerInfo.qualifyDesc = vla.qualifyDesc
-          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc
-          this.cerInfo.remark = vla.remark
+          if (!vla.id) return;
+          this.cerInfo.id = vla.id;
+          this.cerInfo.qualifyName = vla.qualifyName;
+          this.cerInfo.qualifyDesc = vla.qualifyDesc;
+          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc;
+          this.cerInfo.remark = vla.remark;
         } else {
-          this.resetData()
+          this.resetData();
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     // C_list().then((res) => {
@@ -131,56 +137,58 @@
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
       // 重置数据
       // this.resetData()
     },
     // 数据处理
     save() {
-      if (this.title == '新增资质要求') {
-        add(this.cerInfo).then((res) => {
-          console.log(res, res != '')
-          if (res != '') {
-            this.$message({
-              message: '保存成功',
-              type: 'success'
-            })
-            this.close()
-            // 保存后刷新数据
-            this.$emit('refresh')
+      console.log(this.$refs)
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.title == "新增资质要求") {
+            add(this.cerInfo).then((res) => {
+              console.log(res, res != "");
+              this.$message({
+                message: "保存成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
+          } else {
+            update(this.cerInfo).then((res) => {
+              this.$message({
+                message: "更新成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
           }
-        })
-      } else {
-        update(this.cerInfo).then((res) => {
-          if (res != '') {
-            this.$message({
-              message: '更新成功',
-              type: 'success'
-            })
-            this.close()
-            // 保存后刷新数据
-            this.$emit('refresh')
-          }
-        })
-      }
+        } else {
+          return false;
+        }
+      });
     },
     resetData() {
       this.cerInfo = {
-        qualifyName: '',
-        qualifyDesc: '',
-        proveMaterialDesc: '',
-        remark: ''
-      }
-    }
-  }
-}
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-
-.btnBOX{
-    display: flex;
-    justify-content: space-between;
+.btnBOX {
+  display: flex;
+  justify-content: space-between;
 }
 .categoryDialog {
   width: 800px;
@@ -222,9 +230,10 @@
         display: flex;
         align-items: center;
 
-         .label,.el-form-item.el-form-item__label{
-             line-height: 21px !important;
-                line-height:NONE
+        .label,
+        .el-form-item.el-form-item__label {
+          line-height: 21px !important;
+          line-height: NONE;
         }
       }
     }
diff --git a/src/components/mycomponent/dialog/certification/certificationInfoDlalog.vue b/src/components/mycomponent/dialog/certification/certificationInfoDlalog.vue
new file mode 100644
index 0000000..7d5228a
--- /dev/null
+++ b/src/components/mycomponent/dialog/certification/certificationInfoDlalog.vue
@@ -0,0 +1,258 @@
+<!--资质管理新增弹窗-->
+<template>
+  <el-dialog
+    :title="title"
+    width="440px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <el-form
+      :inline="true"
+      :model="cerInfo"
+      class="demo-form-inline"
+      :rules="rules"
+      label-width="115px"
+      ref="form"
+    >
+      <div class="item">
+        <el-form-item label="资质要求名称:" prop="qualifyName" >
+          <el-input v-model.trim="cerInfo.qualifyName" style="width: 250px"  disabled/>
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item label="资质要求描述:" prop="qualifyDesc">
+          <el-input v-model.trim="cerInfo.qualifyDesc" style="width: 250px" disabled/>
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item label="资质要求证明材料要求:" prop="proveMaterialDesc">
+          <el-input
+            v-model.trim="cerInfo.proveMaterialDesc"
+            style="width: 250px"
+            disabled
+          />
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item label="备注:">
+          <el-input
+            v-model.trim="cerInfo.remark"
+            style="width: 250px"
+            type="textarea"
+            :rows="3"
+            placeholder="请输入内容"
+            disabled
+          />
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item class="btnBOX">
+          <!-- <el-button type="primary" @click="close"> 确认 </el-button> -->
+        </el-form-item>
+      </div>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+// import dialogHeader from "./dialogHeader.vue";
+// import inputVue from "../input/inputVue.vue";
+// import InputNumber from "../input/inputNumber.vue";
+// import RedStar from "../redStar.vue";
+// import { Message } from 'element-ui'
+// import { C_add,C_list,C_update,detail } from "../../../api/product/category"
+// import { getCertification } from '../../../api/systemNew/systemNew'
+export default {
+  components: {
+    // inputVue,
+    // dialogHeader,
+    // InputNumber,
+    // RedStar,
+    // Message
+  },
+  props: {
+    isShowInfo: {
+      type: Boolean,
+      default: false,
+    },
+    dataInfo: {
+      type: Object,
+    },
+    Detailclose:{
+      type:Function,
+    },
+    title: "",
+  },
+  data() {
+    return {
+      // 品类信息
+      cerInfo: {
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
+      },
+      categoryList: [],
+      // 资质列表
+      certificationList: [],
+
+      rules: {
+        empty: [{ required: true, message: "此内容不能为空", trigger: "blur" }],
+        qualifyDesc: [
+          { required: true, message: "此内容不能为空", trigger: "blur" },
+        ],
+        proveMaterialDesc: [
+          { required: true, message: "此内容不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  watch: {
+    dataInfo: {
+      handler(vla) {
+        if (vla != "") {
+          // 编辑操作
+          if (!vla.id) return;
+          this.cerInfo.id = vla.id;
+          this.cerInfo.qualifyName = vla.qualifyName;
+          this.cerInfo.qualifyDesc = vla.qualifyDesc;
+          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc;
+          this.cerInfo.remark = vla.remark;
+        } else {
+          this.resetData();
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  mounted() {
+    // C_list().then((res) => {
+    //   this.categoryList = res;
+    // });
+    // getCertification().then((res) => {
+    //   console.log(res);
+    //   this.certificationList = res;
+    // });
+  },
+  methods: {
+    close() {
+      // this.$emit("close");
+      // 重置数据
+      // this.resetData()
+      console.log(123)
+      this.Detailclose()
+    },
+    // 数据处理
+    save() {
+      console.log(this.$refs)
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.title == "新增资质要求") {
+            add(this.cerInfo).then((res) => {
+              console.log(res, res != "");
+              this.$message({
+                message: "保存成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
+          } else {
+            update(this.cerInfo).then((res) => {
+              this.$message({
+                message: "更新成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    resetData() {
+      this.cerInfo = {
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.btnBOX {
+  display: flex;
+  justify-content: space-between;
+}
+.categoryDialog {
+  width: 800px;
+  box-sizing: border-box;
+  .content {
+    padding: 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .inputContent {
+      flex: 1;
+      padding: 0 10px;
+      box-sizing: border-box;
+      .inputbox {
+        margin-bottom: 15px;
+        display: flex;
+        align-items: center;
+      }
+    }
+  }
+
+  .AddContent {
+    max-height: 180px;
+    overflow: auto;
+    border-radius: 5px;
+    box-sizing: border-box;
+    border: 1px solid #999;
+    padding: 10px;
+
+    .addBtn {
+      margin-bottom: 10px;
+    }
+
+    .addItem {
+      display: flex;
+
+      .item {
+        padding-right: 10px;
+        display: flex;
+        align-items: center;
+
+        .label,
+        .el-form-item.el-form-item__label {
+          line-height: 21px !important;
+          line-height: NONE;
+        }
+      }
+    }
+  }
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 100px;
+    }
+  }
+}
+</style>

diff --git a/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue b/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
index 4179b70..9b17937 100644
--- a/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
+++ b/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
@@ -7,27 +7,37 @@
     append-to-body
     @close="close"
   >
-    <el-form :inline="true" :model="cerInfo" class="demo-form-inline" :rules="rules" label-width="115px">
+    <el-form
+      :inline="true"
+      :model="cerInfo"
+      class="demo-form-inline"
+      :rules="rules"
+      label-width="115px"
+      ref="form"
+    >
       <div class="item">
         <el-form-item label="资质要求名称:" prop="qualifyName">
-          <el-input v-model="cerInfo.qualifyName" style="width:250px" />
+          <el-input v-model.trim="cerInfo.qualifyName" style="width: 250px" />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="资质要求描述:" prop="qualifyDesc">
-          <el-input v-model="cerInfo.qualifyDesc" style="width:250px" />
+          <el-input v-model.trim="cerInfo.qualifyDesc" style="width: 250px" />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="资质要求证明材料要求:" prop="proveMaterialDesc">
-          <el-input v-model="cerInfo.proveMaterialDesc" style="width:250px;" />
+          <el-input
+            v-model.trim="cerInfo.proveMaterialDesc"
+            style="width: 250px"
+          />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="备注:">
           <el-input
-            v-model="cerInfo.remark"
-            style="width:250px"
+            v-model.trim="cerInfo.remark"
+            style="width: 250px"
             type="textarea"
             :rows="3"
             placeholder="请输入内容"
@@ -36,10 +46,8 @@
       </div>
       <div class="item">
         <el-form-item class="btnBOX">
-          <el-button type="primary" @click="save">
-            保存
-          </el-button>
-          <el-button type="info" style="margin-left:100px" @click="close">
+          <el-button type="primary" @click="save"> 保存 </el-button>
+          <el-button type="info" style="margin-left: 100px" @click="close">
             取消
           </el-button>
         </el-form-item>
@@ -56,7 +64,7 @@
 // import { Message } from 'element-ui'
 // import { C_add,C_list,C_update,detail } from "../../../api/product/category"
 // import { getCertification } from '../../../api/systemNew/systemNew'
-import { add, update } from '../../../../api/system/certification'
+import { add, update } from "../../../../api/system/certification";
 export default {
   components: {
     // inputVue,
@@ -68,57 +76,55 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
     dataInfo: {
-      type: Object
+      type: Object,
     },
-    title: ''
+    title: "",
   },
   data() {
     return {
       // 品类信息
       cerInfo: {
-        qualifyName: '',
-        qualifyDesc: '',
-        proveMaterialDesc: '',
-        remark: ''
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
       },
       categoryList: [],
       // 资质列表
       certificationList: [],
 
       rules: {
-        empty: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
-        ],
+        empty: [{ required: true, message: "此内容不能为空", trigger: "blur" }],
         qualifyDesc: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
+          { required: true, message: "此内容不能为空", trigger: "blur" },
         ],
         proveMaterialDesc: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
-        ]
-      }
-    }
+          { required: true, message: "此内容不能为空", trigger: "blur" },
+        ],
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vla) {
-        if (vla != '') {
+        if (vla != "") {
           // 编辑操作
-          if (!vla.id) return
-          this.cerInfo.id = vla.id
-          this.cerInfo.qualifyName = vla.qualifyName
-          this.cerInfo.qualifyDesc = vla.qualifyDesc
-          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc
-          this.cerInfo.remark = vla.remark
+          if (!vla.id) return;
+          this.cerInfo.id = vla.id;
+          this.cerInfo.qualifyName = vla.qualifyName;
+          this.cerInfo.qualifyDesc = vla.qualifyDesc;
+          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc;
+          this.cerInfo.remark = vla.remark;
         } else {
-          this.resetData()
+          this.resetData();
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     // C_list().then((res) => {
@@ -131,56 +137,58 @@
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
       // 重置数据
       // this.resetData()
     },
     // 数据处理
     save() {
-      if (this.title == '新增资质要求') {
-        add(this.cerInfo).then((res) => {
-          console.log(res, res != '')
-          if (res != '') {
-            this.$message({
-              message: '保存成功',
-              type: 'success'
-            })
-            this.close()
-            // 保存后刷新数据
-            this.$emit('refresh')
+      console.log(this.$refs)
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.title == "新增资质要求") {
+            add(this.cerInfo).then((res) => {
+              console.log(res, res != "");
+              this.$message({
+                message: "保存成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
+          } else {
+            update(this.cerInfo).then((res) => {
+              this.$message({
+                message: "更新成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
           }
-        })
-      } else {
-        update(this.cerInfo).then((res) => {
-          if (res != '') {
-            this.$message({
-              message: '更新成功',
-              type: 'success'
-            })
-            this.close()
-            // 保存后刷新数据
-            this.$emit('refresh')
-          }
-        })
-      }
+        } else {
+          return false;
+        }
+      });
     },
     resetData() {
       this.cerInfo = {
-        qualifyName: '',
-        qualifyDesc: '',
-        proveMaterialDesc: '',
-        remark: ''
-      }
-    }
-  }
-}
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-
-.btnBOX{
-    display: flex;
-    justify-content: space-between;
+.btnBOX {
+  display: flex;
+  justify-content: space-between;
 }
 .categoryDialog {
   width: 800px;
@@ -222,9 +230,10 @@
         display: flex;
         align-items: center;
 
-         .label,.el-form-item.el-form-item__label{
-             line-height: 21px !important;
-                line-height:NONE
+        .label,
+        .el-form-item.el-form-item__label {
+          line-height: 21px !important;
+          line-height: NONE;
         }
       }
     }
diff --git a/src/components/mycomponent/dialog/certification/certificationInfoDlalog.vue b/src/components/mycomponent/dialog/certification/certificationInfoDlalog.vue
new file mode 100644
index 0000000..7d5228a
--- /dev/null
+++ b/src/components/mycomponent/dialog/certification/certificationInfoDlalog.vue
@@ -0,0 +1,258 @@
+<!--资质管理新增弹窗-->
+<template>
+  <el-dialog
+    :title="title"
+    width="440px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <el-form
+      :inline="true"
+      :model="cerInfo"
+      class="demo-form-inline"
+      :rules="rules"
+      label-width="115px"
+      ref="form"
+    >
+      <div class="item">
+        <el-form-item label="资质要求名称:" prop="qualifyName" >
+          <el-input v-model.trim="cerInfo.qualifyName" style="width: 250px"  disabled/>
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item label="资质要求描述:" prop="qualifyDesc">
+          <el-input v-model.trim="cerInfo.qualifyDesc" style="width: 250px" disabled/>
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item label="资质要求证明材料要求:" prop="proveMaterialDesc">
+          <el-input
+            v-model.trim="cerInfo.proveMaterialDesc"
+            style="width: 250px"
+            disabled
+          />
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item label="备注:">
+          <el-input
+            v-model.trim="cerInfo.remark"
+            style="width: 250px"
+            type="textarea"
+            :rows="3"
+            placeholder="请输入内容"
+            disabled
+          />
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item class="btnBOX">
+          <!-- <el-button type="primary" @click="close"> 确认 </el-button> -->
+        </el-form-item>
+      </div>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+// import dialogHeader from "./dialogHeader.vue";
+// import inputVue from "../input/inputVue.vue";
+// import InputNumber from "../input/inputNumber.vue";
+// import RedStar from "../redStar.vue";
+// import { Message } from 'element-ui'
+// import { C_add,C_list,C_update,detail } from "../../../api/product/category"
+// import { getCertification } from '../../../api/systemNew/systemNew'
+export default {
+  components: {
+    // inputVue,
+    // dialogHeader,
+    // InputNumber,
+    // RedStar,
+    // Message
+  },
+  props: {
+    isShowInfo: {
+      type: Boolean,
+      default: false,
+    },
+    dataInfo: {
+      type: Object,
+    },
+    Detailclose:{
+      type:Function,
+    },
+    title: "",
+  },
+  data() {
+    return {
+      // 品类信息
+      cerInfo: {
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
+      },
+      categoryList: [],
+      // 资质列表
+      certificationList: [],
+
+      rules: {
+        empty: [{ required: true, message: "此内容不能为空", trigger: "blur" }],
+        qualifyDesc: [
+          { required: true, message: "此内容不能为空", trigger: "blur" },
+        ],
+        proveMaterialDesc: [
+          { required: true, message: "此内容不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  watch: {
+    dataInfo: {
+      handler(vla) {
+        if (vla != "") {
+          // 编辑操作
+          if (!vla.id) return;
+          this.cerInfo.id = vla.id;
+          this.cerInfo.qualifyName = vla.qualifyName;
+          this.cerInfo.qualifyDesc = vla.qualifyDesc;
+          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc;
+          this.cerInfo.remark = vla.remark;
+        } else {
+          this.resetData();
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  mounted() {
+    // C_list().then((res) => {
+    //   this.categoryList = res;
+    // });
+    // getCertification().then((res) => {
+    //   console.log(res);
+    //   this.certificationList = res;
+    // });
+  },
+  methods: {
+    close() {
+      // this.$emit("close");
+      // 重置数据
+      // this.resetData()
+      console.log(123)
+      this.Detailclose()
+    },
+    // 数据处理
+    save() {
+      console.log(this.$refs)
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.title == "新增资质要求") {
+            add(this.cerInfo).then((res) => {
+              console.log(res, res != "");
+              this.$message({
+                message: "保存成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
+          } else {
+            update(this.cerInfo).then((res) => {
+              this.$message({
+                message: "更新成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    resetData() {
+      this.cerInfo = {
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.btnBOX {
+  display: flex;
+  justify-content: space-between;
+}
+.categoryDialog {
+  width: 800px;
+  box-sizing: border-box;
+  .content {
+    padding: 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .inputContent {
+      flex: 1;
+      padding: 0 10px;
+      box-sizing: border-box;
+      .inputbox {
+        margin-bottom: 15px;
+        display: flex;
+        align-items: center;
+      }
+    }
+  }
+
+  .AddContent {
+    max-height: 180px;
+    overflow: auto;
+    border-radius: 5px;
+    box-sizing: border-box;
+    border: 1px solid #999;
+    padding: 10px;
+
+    .addBtn {
+      margin-bottom: 10px;
+    }
+
+    .addItem {
+      display: flex;
+
+      .item {
+        padding-right: 10px;
+        display: flex;
+        align-items: center;
+
+        .label,
+        .el-form-item.el-form-item__label {
+          line-height: 21px !important;
+          line-height: NONE;
+        }
+      }
+    }
+  }
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 100px;
+    }
+  }
+}
+</style>
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..d248ed1 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -53,7 +53,7 @@
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
             <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px;margin-left: 58px;"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>

diff --git a/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue b/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
index 4179b70..9b17937 100644
--- a/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
+++ b/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
@@ -7,27 +7,37 @@
     append-to-body
     @close="close"
   >
-    <el-form :inline="true" :model="cerInfo" class="demo-form-inline" :rules="rules" label-width="115px">
+    <el-form
+      :inline="true"
+      :model="cerInfo"
+      class="demo-form-inline"
+      :rules="rules"
+      label-width="115px"
+      ref="form"
+    >
       <div class="item">
         <el-form-item label="资质要求名称:" prop="qualifyName">
-          <el-input v-model="cerInfo.qualifyName" style="width:250px" />
+          <el-input v-model.trim="cerInfo.qualifyName" style="width: 250px" />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="资质要求描述:" prop="qualifyDesc">
-          <el-input v-model="cerInfo.qualifyDesc" style="width:250px" />
+          <el-input v-model.trim="cerInfo.qualifyDesc" style="width: 250px" />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="资质要求证明材料要求:" prop="proveMaterialDesc">
-          <el-input v-model="cerInfo.proveMaterialDesc" style="width:250px;" />
+          <el-input
+            v-model.trim="cerInfo.proveMaterialDesc"
+            style="width: 250px"
+          />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="备注:">
           <el-input
-            v-model="cerInfo.remark"
-            style="width:250px"
+            v-model.trim="cerInfo.remark"
+            style="width: 250px"
             type="textarea"
             :rows="3"
             placeholder="请输入内容"
@@ -36,10 +46,8 @@
       </div>
       <div class="item">
         <el-form-item class="btnBOX">
-          <el-button type="primary" @click="save">
-            保存
-          </el-button>
-          <el-button type="info" style="margin-left:100px" @click="close">
+          <el-button type="primary" @click="save"> 保存 </el-button>
+          <el-button type="info" style="margin-left: 100px" @click="close">
             取消
           </el-button>
         </el-form-item>
@@ -56,7 +64,7 @@
 // import { Message } from 'element-ui'
 // import { C_add,C_list,C_update,detail } from "../../../api/product/category"
 // import { getCertification } from '../../../api/systemNew/systemNew'
-import { add, update } from '../../../../api/system/certification'
+import { add, update } from "../../../../api/system/certification";
 export default {
   components: {
     // inputVue,
@@ -68,57 +76,55 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
     dataInfo: {
-      type: Object
+      type: Object,
     },
-    title: ''
+    title: "",
   },
   data() {
     return {
       // 品类信息
       cerInfo: {
-        qualifyName: '',
-        qualifyDesc: '',
-        proveMaterialDesc: '',
-        remark: ''
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
       },
       categoryList: [],
       // 资质列表
       certificationList: [],
 
       rules: {
-        empty: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
-        ],
+        empty: [{ required: true, message: "此内容不能为空", trigger: "blur" }],
         qualifyDesc: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
+          { required: true, message: "此内容不能为空", trigger: "blur" },
         ],
         proveMaterialDesc: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
-        ]
-      }
-    }
+          { required: true, message: "此内容不能为空", trigger: "blur" },
+        ],
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vla) {
-        if (vla != '') {
+        if (vla != "") {
           // 编辑操作
-          if (!vla.id) return
-          this.cerInfo.id = vla.id
-          this.cerInfo.qualifyName = vla.qualifyName
-          this.cerInfo.qualifyDesc = vla.qualifyDesc
-          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc
-          this.cerInfo.remark = vla.remark
+          if (!vla.id) return;
+          this.cerInfo.id = vla.id;
+          this.cerInfo.qualifyName = vla.qualifyName;
+          this.cerInfo.qualifyDesc = vla.qualifyDesc;
+          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc;
+          this.cerInfo.remark = vla.remark;
         } else {
-          this.resetData()
+          this.resetData();
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     // C_list().then((res) => {
@@ -131,56 +137,58 @@
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
       // 重置数据
       // this.resetData()
     },
     // 数据处理
     save() {
-      if (this.title == '新增资质要求') {
-        add(this.cerInfo).then((res) => {
-          console.log(res, res != '')
-          if (res != '') {
-            this.$message({
-              message: '保存成功',
-              type: 'success'
-            })
-            this.close()
-            // 保存后刷新数据
-            this.$emit('refresh')
+      console.log(this.$refs)
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.title == "新增资质要求") {
+            add(this.cerInfo).then((res) => {
+              console.log(res, res != "");
+              this.$message({
+                message: "保存成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
+          } else {
+            update(this.cerInfo).then((res) => {
+              this.$message({
+                message: "更新成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
           }
-        })
-      } else {
-        update(this.cerInfo).then((res) => {
-          if (res != '') {
-            this.$message({
-              message: '更新成功',
-              type: 'success'
-            })
-            this.close()
-            // 保存后刷新数据
-            this.$emit('refresh')
-          }
-        })
-      }
+        } else {
+          return false;
+        }
+      });
     },
     resetData() {
       this.cerInfo = {
-        qualifyName: '',
-        qualifyDesc: '',
-        proveMaterialDesc: '',
-        remark: ''
-      }
-    }
-  }
-}
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-
-.btnBOX{
-    display: flex;
-    justify-content: space-between;
+.btnBOX {
+  display: flex;
+  justify-content: space-between;
 }
 .categoryDialog {
   width: 800px;
@@ -222,9 +230,10 @@
         display: flex;
         align-items: center;
 
-         .label,.el-form-item.el-form-item__label{
-             line-height: 21px !important;
-                line-height:NONE
+        .label,
+        .el-form-item.el-form-item__label {
+          line-height: 21px !important;
+          line-height: NONE;
         }
       }
     }
diff --git a/src/components/mycomponent/dialog/certification/certificationInfoDlalog.vue b/src/components/mycomponent/dialog/certification/certificationInfoDlalog.vue
new file mode 100644
index 0000000..7d5228a
--- /dev/null
+++ b/src/components/mycomponent/dialog/certification/certificationInfoDlalog.vue
@@ -0,0 +1,258 @@
+<!--资质管理新增弹窗-->
+<template>
+  <el-dialog
+    :title="title"
+    width="440px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <el-form
+      :inline="true"
+      :model="cerInfo"
+      class="demo-form-inline"
+      :rules="rules"
+      label-width="115px"
+      ref="form"
+    >
+      <div class="item">
+        <el-form-item label="资质要求名称:" prop="qualifyName" >
+          <el-input v-model.trim="cerInfo.qualifyName" style="width: 250px"  disabled/>
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item label="资质要求描述:" prop="qualifyDesc">
+          <el-input v-model.trim="cerInfo.qualifyDesc" style="width: 250px" disabled/>
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item label="资质要求证明材料要求:" prop="proveMaterialDesc">
+          <el-input
+            v-model.trim="cerInfo.proveMaterialDesc"
+            style="width: 250px"
+            disabled
+          />
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item label="备注:">
+          <el-input
+            v-model.trim="cerInfo.remark"
+            style="width: 250px"
+            type="textarea"
+            :rows="3"
+            placeholder="请输入内容"
+            disabled
+          />
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item class="btnBOX">
+          <!-- <el-button type="primary" @click="close"> 确认 </el-button> -->
+        </el-form-item>
+      </div>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+// import dialogHeader from "./dialogHeader.vue";
+// import inputVue from "../input/inputVue.vue";
+// import InputNumber from "../input/inputNumber.vue";
+// import RedStar from "../redStar.vue";
+// import { Message } from 'element-ui'
+// import { C_add,C_list,C_update,detail } from "../../../api/product/category"
+// import { getCertification } from '../../../api/systemNew/systemNew'
+export default {
+  components: {
+    // inputVue,
+    // dialogHeader,
+    // InputNumber,
+    // RedStar,
+    // Message
+  },
+  props: {
+    isShowInfo: {
+      type: Boolean,
+      default: false,
+    },
+    dataInfo: {
+      type: Object,
+    },
+    Detailclose:{
+      type:Function,
+    },
+    title: "",
+  },
+  data() {
+    return {
+      // 品类信息
+      cerInfo: {
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
+      },
+      categoryList: [],
+      // 资质列表
+      certificationList: [],
+
+      rules: {
+        empty: [{ required: true, message: "此内容不能为空", trigger: "blur" }],
+        qualifyDesc: [
+          { required: true, message: "此内容不能为空", trigger: "blur" },
+        ],
+        proveMaterialDesc: [
+          { required: true, message: "此内容不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  watch: {
+    dataInfo: {
+      handler(vla) {
+        if (vla != "") {
+          // 编辑操作
+          if (!vla.id) return;
+          this.cerInfo.id = vla.id;
+          this.cerInfo.qualifyName = vla.qualifyName;
+          this.cerInfo.qualifyDesc = vla.qualifyDesc;
+          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc;
+          this.cerInfo.remark = vla.remark;
+        } else {
+          this.resetData();
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  mounted() {
+    // C_list().then((res) => {
+    //   this.categoryList = res;
+    // });
+    // getCertification().then((res) => {
+    //   console.log(res);
+    //   this.certificationList = res;
+    // });
+  },
+  methods: {
+    close() {
+      // this.$emit("close");
+      // 重置数据
+      // this.resetData()
+      console.log(123)
+      this.Detailclose()
+    },
+    // 数据处理
+    save() {
+      console.log(this.$refs)
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.title == "新增资质要求") {
+            add(this.cerInfo).then((res) => {
+              console.log(res, res != "");
+              this.$message({
+                message: "保存成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
+          } else {
+            update(this.cerInfo).then((res) => {
+              this.$message({
+                message: "更新成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    resetData() {
+      this.cerInfo = {
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.btnBOX {
+  display: flex;
+  justify-content: space-between;
+}
+.categoryDialog {
+  width: 800px;
+  box-sizing: border-box;
+  .content {
+    padding: 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .inputContent {
+      flex: 1;
+      padding: 0 10px;
+      box-sizing: border-box;
+      .inputbox {
+        margin-bottom: 15px;
+        display: flex;
+        align-items: center;
+      }
+    }
+  }
+
+  .AddContent {
+    max-height: 180px;
+    overflow: auto;
+    border-radius: 5px;
+    box-sizing: border-box;
+    border: 1px solid #999;
+    padding: 10px;
+
+    .addBtn {
+      margin-bottom: 10px;
+    }
+
+    .addItem {
+      display: flex;
+
+      .item {
+        padding-right: 10px;
+        display: flex;
+        align-items: center;
+
+        .label,
+        .el-form-item.el-form-item__label {
+          line-height: 21px !important;
+          line-height: NONE;
+        }
+      }
+    }
+  }
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 100px;
+    }
+  }
+}
+</style>
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..d248ed1 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -53,7 +53,7 @@
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
             <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px;margin-left: 58px;"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index feb9245..00602b6 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -27,21 +27,46 @@
       <div class="productInput">
         SN码
         <div class="inputBox" style="width: 120px">
-          <el-input v-model="selectInfo.snCode" placeholder="请入SN码" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.snCode"
+            placeholder="请入SN码"
+            clearable
+            class="product-input"
+          />
         </div>
         设备型号
         <div class="inputBox" style="width: 144px">
-          <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.productCode"
+            placeholder="请入设备型号"
+            clearable
+            class="product-input"
+          />
         </div>
         品牌
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备品牌">
-            <el-option v-for="item in brandList" :key="item.id" :label="item.brandName" :value="item.brandName" />
+          <el-select
+            v-model="selectInfo.brandName"
+            filterable
+            clearable
+            placeholder="请输入或选择设备品牌"
+          >
+            <el-option
+              v-for="item in brandList"
+              :key="item.id"
+              :label="item.brandName"
+              :value="item.brandName"
+            />
           </el-select>
         </div>
         设备状态
         <div class="inputBox" style="width: 90px">
-          <el-select v-model="selectInfo.deviceStatus" filterable clearable placeholder="请选择">
+          <el-select
+            v-model="selectInfo.deviceStatus"
+            filterable
+            clearable
+            placeholder="请选择"
+          >
             <el-option
               v-for="item in DevState"
               :key="item.value"
@@ -52,7 +77,12 @@
         </div>
         是否绑定用户
         <div class="inputBox" style="width: 90px">
-          <el-select v-model="selectInfo.deviceBindUser" filterable clearable placeholder="请选择">
+          <el-select
+            v-model="selectInfo.deviceBindUser"
+            filterable
+            clearable
+            placeholder="请选择"
+          >
             <el-option
               v-for="item in userBind"
               :key="item.value"
@@ -63,21 +93,39 @@
         </div>
       </div>
       <div class="productBtn">
-        <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="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
-        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" @click=" BatchDelete">
+        <el-button
+          type="danger"
+          con="el-icon-delete-solid"
+          lass="btnItem bgred"
+          @click="BatchDelete"
+        >
           一键解绑
         </el-button>
-        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
+        <el-button
+          type="primary"
+          icon="el-icon-folder-opened"
+          class="btnItem"
+          @click="exportToExcel"
+        >
           导出
         </el-button>
-        <el-button type="primary" @click="Upgrade">
-          一键固件升级
-        </el-button>
+        <el-button type="primary" @click="Upgrade"> 一键固件升级 </el-button>
       </div>
     </div>
     <el-table
@@ -85,73 +133,48 @@
       v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
-      :header-cell-style="{'text-align': 'center' ,background:'  #2483b3',color:'white'}"
-      :row-style="{'text-align': 'center'}"
+      :header-cell-style="{
+        'text-align': 'center',
+        background: '  #2483b3',
+        color: 'white',
+      }"
+      :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
+      <el-table-column type="selection" width="55" />
       <!-- <el-table-column
         type="index"
         width="55"
         label="编号"
       /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="snCode"
-        label="SN码"
-      />
-      <el-table-column
-        prop="brandName"
-        label="设备品牌"
-      />
-      <el-table-column
-        prop="productCode"
-        label="设备型号"
-      />
-      <el-table-column
-        prop="createTime"
-        label="生产日期"
-      />
-      <el-table-column
-        prop="deviceStatus"
-        label="设备状态"
-      >
+      <el-table-column prop="snCode" label="SN码" />
+      <el-table-column prop="brandName" label="设备品牌" />
+      <el-table-column prop="productCode" label="设备型号" />
+      <el-table-column prop="createTime" label="生产日期" />
+      <el-table-column prop="deviceStatus" label="设备状态">
         <template slot-scope="scope">
           <!-- {{scope.deviceStatus=='1'}} -->
           <!-- {{scope.row.deviceStatus=='1'}} -->
-          {{ scope.row.deviceStatus=='1'?'在线':'离线' }}
+          {{ scope.row.deviceStatus == "1" ? "在线" : "离线" }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceActiveTime"
-        label="激活时间"
-      />
-      <el-table-column
-        prop="deviceActive"
-        label="是否激活"
-      >
+      <el-table-column prop="deviceActiveTime" label="激活时间" />
+      <el-table-column prop="deviceActive" label="是否激活">
         <template slot-scope="scope">
-          {{ scope.row.deviceActive=='1'?'是':'否' }}
+          {{ scope.row.deviceActive == "1" ? "是" : "否" }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceBindUser"
-        label="是否用户绑定设备"
-      >
+      <el-table-column prop="deviceBindUser" label="是否用户绑定设备">
         <template slot-scope="scope">
-          {{ scope.row.deviceBindUser=='1'?'是':'否' }}
+          {{ scope.row.deviceBindUser == "1" ? "是" : "否" }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-      >
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
@@ -160,74 +183,91 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
-    <device-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
+    <group-page
+      v-model="isFristPage"
+      :limit="limit"
+      :total="total"
+      :offset="offset"
+      :count="tableData.total"
+      @setOffset="setOffset"
+      @setLimit="setLimit"
+    />
+    <device-info-dialog
+      :is-show-info="isShowInfo"
+      :data-info="rowInfo"
+      @close="closeInfo"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import DataInfoItem from '../../components/mycomponent/DataInfoItem.vue'
-import deviceInfoDialog from '../../components/mycomponent/dialog/deviceInfoDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import DataInfoItem from "../../components/mycomponent/DataInfoItem.vue";
+import deviceInfoDialog from "../../components/mycomponent/dialog/deviceInfoDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade, d_listExport } from '../../api/product/device'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { SelectList } from '../../api/product/brand'
-import { exportFile } from '@/utils/exportutils'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import {
+  d_listPage,
+  d_statistics,
+  d_unbind,
+  d_firmwareUpgrade,
+  d_listExport,
+} from "../../api/product/device";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { SelectList } from "../../api/product/brand";
+import { exportFile } from "@/utils/exportutils";
 import { export_json_to_excel } from "../../utils/Export2Excel";
 export default {
   components: {
     DataInfoItem,
     deviceInfoDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       statistics: {},
       dataInfo: {}, // 新数据的chushixiang
-      selectInfo: { // 搜索框中的数据的数据
-        snCode: '',
-        productCode: '',
-        brandName: '',
-        deviceStatus: '',
-        deviceBindUser: ''
+      selectInfo: {
+        // 搜索框中的数据的数据
+        snCode: "",
+        productCode: "",
+        brandName: "",
+        deviceStatus: "",
+        deviceBindUser: "",
       },
       brandList: [],
       DevState: [
-
         {
-          label: '在线',
-          value: '1'
+          label: "在线",
+          value: "1",
         },
         {
-          label: '离线',
-          value: '0'
-        }
+          label: "离线",
+          value: "0",
+        },
       ],
       userBind: [
         {
-          label: '是',
-          value: '1'
+          label: "是",
+          value: "1",
         },
         {
-          label: '否',
-          value: '0'
-        }
-      ]
-
-    }
+          label: "否",
+          value: "0",
+        },
+      ],
+    };
   },
   mounted() {
     // 相关状态获取
-    d_statistics().then(res => {
-      this.statistics = res
-    })
-    SelectList().then(res => {
-      this.brandList = res
-    })
+    d_statistics().then((res) => {
+      this.statistics = res;
+    });
+    SelectList().then((res) => {
+      this.brandList = res;
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
@@ -240,97 +280,103 @@
     // },
     // 获取指定页面
     getListPage(limit, offset) {
-      this.loading = true
-      d_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-      // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
+      this.loading = true;
+      d_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;
         })
-        this.tableData = res
-        this.loading = false
-      }).catch(_ => {
-        this.loading = false
-      })
+        .catch((_) => {
+          this.loading = false;
+        });
     },
     reset() {
       this.selectInfo = {
-        snCode: '',
-        productCode: '',
-        brandName: '',
-        deviceStatus: '',
-        deviceBindUser: ''
-      }
-      this.queryInfo = { ...this.selectInfo }
-      this.refresh()
+        snCode: "",
+        productCode: "",
+        brandName: "",
+        deviceStatus: "",
+        deviceBindUser: "",
+      };
+      this.queryInfo = { ...this.selectInfo };
+      this.refresh();
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      d_unbind({ deviceIds: ids }).then(res => {
-        this.$message({
-          message: res || '解绑成功',
-          type: 'success'
-        })
-        this.refresh()
-      }).catch(_ => {
-
-      })
+      if (this.$refs.multipleTable.selection.length) {
+        //  得到选中行
+        const dle_ary = this.$refs.multipleTable.selection;
+        const ids = [];
+        dle_ary.forEach((ele) => {
+          ids.push(ele.id);
+        });
+        d_unbind({ deviceIds: ids })
+          .then((res) => {
+            this.$message({
+              message: res || "解绑成功",
+              type: "success",
+            });
+            this.refresh();
+          })
+          .catch((_) => {});
+      }else{
+        this.$message.warning('请先选择需要解绑的设备')
+      }
     },
     Upgrade() {
       //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      console.log(dle_ary)
-      dle_ary.forEach(ele => {
-        ids.push(ele.deviceId)
-      })
-      d_firmwareUpgrade({ deviceIds: ids }).then(res => {
+      const dle_ary = this.$refs.multipleTable.selection;
+      const ids = [];
+      console.log(dle_ary);
+      dle_ary.forEach((ele) => {
+        ids.push(ele.deviceId);
+      });
+      d_firmwareUpgrade({ deviceIds: ids }).then((res) => {
         this.$message({
-          message: res || '升级成功',
-          type: 'success'
-        })
-        this.refresh()
-      })
+          message: res || "升级成功",
+          type: "success",
+        });
+        this.refresh();
+      });
     },
     exportToExcel() {
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
-        text: '下载中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      d_listExport(this.selectInfo).then(res => {
-        loading.close() // 关闭加载动画
-        const blob = new Blob([res.data])
-        let fileName = '设备列表.xlsx'
-        fileName = fileName.replace(/-|:| /g, '')
-        exportFile(blob, fileName)
-      })
+        text: "下载中,请稍后...",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      d_listExport(this.selectInfo).then((res) => {
+        loading.close(); // 关闭加载动画
+        const blob = new Blob([res.data]);
+        let fileName = "设备列表.xlsx";
+        fileName = fileName.replace(/-|:| /g, "");
+        exportFile(blob, fileName);
+      });
       // d_listPage("offset=1", {}).then((res) => {
       //   console.log(res.rows, "全部数据");
-        // 对数据进行加工
-        // res.rows = res.rows.map((item) => {
-        //   return {
-        //     产品名称: item.productName,
-        //     产品品牌: item.brandName,
-        //     产品型号: item.productCode,
-        //     产品品类: item.categoryStr,
-        //     产品颜色: item.productColor,
-        //     产品材质: item.productMaterialQuality,
-        //     产品状态: item.productStatus,
-        //     产品版本: item.productEdition,
-        //     规格: item.productPackageSize,
-        //     重量: item.productWeight,
-        //     国际69码: item.internationalCode,
-        //     更新时间: item.updateTime,
-        //   };
-        // });
+      // 对数据进行加工
+      // res.rows = res.rows.map((item) => {
+      //   return {
+      //     产品名称: item.productName,
+      //     产品品牌: item.brandName,
+      //     产品型号: item.productCode,
+      //     产品品类: item.categoryStr,
+      //     产品颜色: item.productColor,
+      //     产品材质: item.productMaterialQuality,
+      //     产品状态: item.productStatus,
+      //     产品版本: item.productEdition,
+      //     规格: item.productPackageSize,
+      //     重量: item.productWeight,
+      //     国际69码: item.internationalCode,
+      //     更新时间: item.updateTime,
+      //   };
+      // });
       //   this.ExportTable = res.rows;
       //   const header = Object.keys(res.rows[0]);
       //   console.log(header);
@@ -352,13 +398,12 @@
       //     filename: "设备列表",
       //   });
       // });
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-
 .product_container {
   position: relative;
   width: 100%;
@@ -393,7 +438,6 @@
         // width: 84px;
         //font-size: 16px;
       }
-
     }
   }
 }

diff --git a/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue b/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
index 4179b70..9b17937 100644
--- a/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
+++ b/src/components/mycomponent/dialog/certification/certificationAddDlalog.vue
@@ -7,27 +7,37 @@
     append-to-body
     @close="close"
   >
-    <el-form :inline="true" :model="cerInfo" class="demo-form-inline" :rules="rules" label-width="115px">
+    <el-form
+      :inline="true"
+      :model="cerInfo"
+      class="demo-form-inline"
+      :rules="rules"
+      label-width="115px"
+      ref="form"
+    >
       <div class="item">
         <el-form-item label="资质要求名称:" prop="qualifyName">
-          <el-input v-model="cerInfo.qualifyName" style="width:250px" />
+          <el-input v-model.trim="cerInfo.qualifyName" style="width: 250px" />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="资质要求描述:" prop="qualifyDesc">
-          <el-input v-model="cerInfo.qualifyDesc" style="width:250px" />
+          <el-input v-model.trim="cerInfo.qualifyDesc" style="width: 250px" />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="资质要求证明材料要求:" prop="proveMaterialDesc">
-          <el-input v-model="cerInfo.proveMaterialDesc" style="width:250px;" />
+          <el-input
+            v-model.trim="cerInfo.proveMaterialDesc"
+            style="width: 250px"
+          />
         </el-form-item>
       </div>
       <div class="item">
         <el-form-item label="备注:">
           <el-input
-            v-model="cerInfo.remark"
-            style="width:250px"
+            v-model.trim="cerInfo.remark"
+            style="width: 250px"
             type="textarea"
             :rows="3"
             placeholder="请输入内容"
@@ -36,10 +46,8 @@
       </div>
       <div class="item">
         <el-form-item class="btnBOX">
-          <el-button type="primary" @click="save">
-            保存
-          </el-button>
-          <el-button type="info" style="margin-left:100px" @click="close">
+          <el-button type="primary" @click="save"> 保存 </el-button>
+          <el-button type="info" style="margin-left: 100px" @click="close">
             取消
           </el-button>
         </el-form-item>
@@ -56,7 +64,7 @@
 // import { Message } from 'element-ui'
 // import { C_add,C_list,C_update,detail } from "../../../api/product/category"
 // import { getCertification } from '../../../api/systemNew/systemNew'
-import { add, update } from '../../../../api/system/certification'
+import { add, update } from "../../../../api/system/certification";
 export default {
   components: {
     // inputVue,
@@ -68,57 +76,55 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
     dataInfo: {
-      type: Object
+      type: Object,
     },
-    title: ''
+    title: "",
   },
   data() {
     return {
       // 品类信息
       cerInfo: {
-        qualifyName: '',
-        qualifyDesc: '',
-        proveMaterialDesc: '',
-        remark: ''
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
       },
       categoryList: [],
       // 资质列表
       certificationList: [],
 
       rules: {
-        empty: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
-        ],
+        empty: [{ required: true, message: "此内容不能为空", trigger: "blur" }],
         qualifyDesc: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
+          { required: true, message: "此内容不能为空", trigger: "blur" },
         ],
         proveMaterialDesc: [
-          { required: true, message: '此内容不能为空', trigger: 'blur' }
-        ]
-      }
-    }
+          { required: true, message: "此内容不能为空", trigger: "blur" },
+        ],
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vla) {
-        if (vla != '') {
+        if (vla != "") {
           // 编辑操作
-          if (!vla.id) return
-          this.cerInfo.id = vla.id
-          this.cerInfo.qualifyName = vla.qualifyName
-          this.cerInfo.qualifyDesc = vla.qualifyDesc
-          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc
-          this.cerInfo.remark = vla.remark
+          if (!vla.id) return;
+          this.cerInfo.id = vla.id;
+          this.cerInfo.qualifyName = vla.qualifyName;
+          this.cerInfo.qualifyDesc = vla.qualifyDesc;
+          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc;
+          this.cerInfo.remark = vla.remark;
         } else {
-          this.resetData()
+          this.resetData();
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     // C_list().then((res) => {
@@ -131,56 +137,58 @@
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
       // 重置数据
       // this.resetData()
     },
     // 数据处理
     save() {
-      if (this.title == '新增资质要求') {
-        add(this.cerInfo).then((res) => {
-          console.log(res, res != '')
-          if (res != '') {
-            this.$message({
-              message: '保存成功',
-              type: 'success'
-            })
-            this.close()
-            // 保存后刷新数据
-            this.$emit('refresh')
+      console.log(this.$refs)
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.title == "新增资质要求") {
+            add(this.cerInfo).then((res) => {
+              console.log(res, res != "");
+              this.$message({
+                message: "保存成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
+          } else {
+            update(this.cerInfo).then((res) => {
+              this.$message({
+                message: "更新成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
           }
-        })
-      } else {
-        update(this.cerInfo).then((res) => {
-          if (res != '') {
-            this.$message({
-              message: '更新成功',
-              type: 'success'
-            })
-            this.close()
-            // 保存后刷新数据
-            this.$emit('refresh')
-          }
-        })
-      }
+        } else {
+          return false;
+        }
+      });
     },
     resetData() {
       this.cerInfo = {
-        qualifyName: '',
-        qualifyDesc: '',
-        proveMaterialDesc: '',
-        remark: ''
-      }
-    }
-  }
-}
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
+      };
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-
-.btnBOX{
-    display: flex;
-    justify-content: space-between;
+.btnBOX {
+  display: flex;
+  justify-content: space-between;
 }
 .categoryDialog {
   width: 800px;
@@ -222,9 +230,10 @@
         display: flex;
         align-items: center;
 
-         .label,.el-form-item.el-form-item__label{
-             line-height: 21px !important;
-                line-height:NONE
+        .label,
+        .el-form-item.el-form-item__label {
+          line-height: 21px !important;
+          line-height: NONE;
         }
       }
     }
diff --git a/src/components/mycomponent/dialog/certification/certificationInfoDlalog.vue b/src/components/mycomponent/dialog/certification/certificationInfoDlalog.vue
new file mode 100644
index 0000000..7d5228a
--- /dev/null
+++ b/src/components/mycomponent/dialog/certification/certificationInfoDlalog.vue
@@ -0,0 +1,258 @@
+<!--资质管理新增弹窗-->
+<template>
+  <el-dialog
+    :title="title"
+    width="440px"
+    :visible.sync="isShowInfo"
+    append-to-body
+    @close="close"
+  >
+    <el-form
+      :inline="true"
+      :model="cerInfo"
+      class="demo-form-inline"
+      :rules="rules"
+      label-width="115px"
+      ref="form"
+    >
+      <div class="item">
+        <el-form-item label="资质要求名称:" prop="qualifyName" >
+          <el-input v-model.trim="cerInfo.qualifyName" style="width: 250px"  disabled/>
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item label="资质要求描述:" prop="qualifyDesc">
+          <el-input v-model.trim="cerInfo.qualifyDesc" style="width: 250px" disabled/>
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item label="资质要求证明材料要求:" prop="proveMaterialDesc">
+          <el-input
+            v-model.trim="cerInfo.proveMaterialDesc"
+            style="width: 250px"
+            disabled
+          />
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item label="备注:">
+          <el-input
+            v-model.trim="cerInfo.remark"
+            style="width: 250px"
+            type="textarea"
+            :rows="3"
+            placeholder="请输入内容"
+            disabled
+          />
+        </el-form-item>
+      </div>
+      <div class="item">
+        <el-form-item class="btnBOX">
+          <!-- <el-button type="primary" @click="close"> 确认 </el-button> -->
+        </el-form-item>
+      </div>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+// import dialogHeader from "./dialogHeader.vue";
+// import inputVue from "../input/inputVue.vue";
+// import InputNumber from "../input/inputNumber.vue";
+// import RedStar from "../redStar.vue";
+// import { Message } from 'element-ui'
+// import { C_add,C_list,C_update,detail } from "../../../api/product/category"
+// import { getCertification } from '../../../api/systemNew/systemNew'
+export default {
+  components: {
+    // inputVue,
+    // dialogHeader,
+    // InputNumber,
+    // RedStar,
+    // Message
+  },
+  props: {
+    isShowInfo: {
+      type: Boolean,
+      default: false,
+    },
+    dataInfo: {
+      type: Object,
+    },
+    Detailclose:{
+      type:Function,
+    },
+    title: "",
+  },
+  data() {
+    return {
+      // 品类信息
+      cerInfo: {
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
+      },
+      categoryList: [],
+      // 资质列表
+      certificationList: [],
+
+      rules: {
+        empty: [{ required: true, message: "此内容不能为空", trigger: "blur" }],
+        qualifyDesc: [
+          { required: true, message: "此内容不能为空", trigger: "blur" },
+        ],
+        proveMaterialDesc: [
+          { required: true, message: "此内容不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  watch: {
+    dataInfo: {
+      handler(vla) {
+        if (vla != "") {
+          // 编辑操作
+          if (!vla.id) return;
+          this.cerInfo.id = vla.id;
+          this.cerInfo.qualifyName = vla.qualifyName;
+          this.cerInfo.qualifyDesc = vla.qualifyDesc;
+          this.cerInfo.proveMaterialDesc = vla.proveMaterialDesc;
+          this.cerInfo.remark = vla.remark;
+        } else {
+          this.resetData();
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  mounted() {
+    // C_list().then((res) => {
+    //   this.categoryList = res;
+    // });
+    // getCertification().then((res) => {
+    //   console.log(res);
+    //   this.certificationList = res;
+    // });
+  },
+  methods: {
+    close() {
+      // this.$emit("close");
+      // 重置数据
+      // this.resetData()
+      console.log(123)
+      this.Detailclose()
+    },
+    // 数据处理
+    save() {
+      console.log(this.$refs)
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.title == "新增资质要求") {
+            add(this.cerInfo).then((res) => {
+              console.log(res, res != "");
+              this.$message({
+                message: "保存成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
+          } else {
+            update(this.cerInfo).then((res) => {
+              this.$message({
+                message: "更新成功",
+                type: "success",
+              });
+              this.close();
+              // 保存后刷新数据
+              this.$emit("refresh");
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    resetData() {
+      this.cerInfo = {
+        qualifyName: "",
+        qualifyDesc: "",
+        proveMaterialDesc: "",
+        remark: "",
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.btnBOX {
+  display: flex;
+  justify-content: space-between;
+}
+.categoryDialog {
+  width: 800px;
+  box-sizing: border-box;
+  .content {
+    padding: 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .inputContent {
+      flex: 1;
+      padding: 0 10px;
+      box-sizing: border-box;
+      .inputbox {
+        margin-bottom: 15px;
+        display: flex;
+        align-items: center;
+      }
+    }
+  }
+
+  .AddContent {
+    max-height: 180px;
+    overflow: auto;
+    border-radius: 5px;
+    box-sizing: border-box;
+    border: 1px solid #999;
+    padding: 10px;
+
+    .addBtn {
+      margin-bottom: 10px;
+    }
+
+    .addItem {
+      display: flex;
+
+      .item {
+        padding-right: 10px;
+        display: flex;
+        align-items: center;
+
+        .label,
+        .el-form-item.el-form-item__label {
+          line-height: 21px !important;
+          line-height: NONE;
+        }
+      }
+    }
+  }
+
+  .btnBox {
+    padding: 30px;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .save,
+    .close {
+      width: 100px;
+    }
+  }
+}
+</style>
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..d248ed1 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -53,7 +53,7 @@
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
             <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px;margin-left: 58px;"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index feb9245..00602b6 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -27,21 +27,46 @@
       <div class="productInput">
         SN码
         <div class="inputBox" style="width: 120px">
-          <el-input v-model="selectInfo.snCode" placeholder="请入SN码" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.snCode"
+            placeholder="请入SN码"
+            clearable
+            class="product-input"
+          />
         </div>
         设备型号
         <div class="inputBox" style="width: 144px">
-          <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
+          <el-input
+            v-model="selectInfo.productCode"
+            placeholder="请入设备型号"
+            clearable
+            class="product-input"
+          />
         </div>
         品牌
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备品牌">
-            <el-option v-for="item in brandList" :key="item.id" :label="item.brandName" :value="item.brandName" />
+          <el-select
+            v-model="selectInfo.brandName"
+            filterable
+            clearable
+            placeholder="请输入或选择设备品牌"
+          >
+            <el-option
+              v-for="item in brandList"
+              :key="item.id"
+              :label="item.brandName"
+              :value="item.brandName"
+            />
           </el-select>
         </div>
         设备状态
         <div class="inputBox" style="width: 90px">
-          <el-select v-model="selectInfo.deviceStatus" filterable clearable placeholder="请选择">
+          <el-select
+            v-model="selectInfo.deviceStatus"
+            filterable
+            clearable
+            placeholder="请选择"
+          >
             <el-option
               v-for="item in DevState"
               :key="item.value"
@@ -52,7 +77,12 @@
         </div>
         是否绑定用户
         <div class="inputBox" style="width: 90px">
-          <el-select v-model="selectInfo.deviceBindUser" filterable clearable placeholder="请选择">
+          <el-select
+            v-model="selectInfo.deviceBindUser"
+            filterable
+            clearable
+            placeholder="请选择"
+          >
             <el-option
               v-for="item in userBind"
               :key="item.value"
@@ -63,21 +93,39 @@
         </div>
       </div>
       <div class="productBtn">
-        <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="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
           重置
         </el-button>
-        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" @click=" BatchDelete">
+        <el-button
+          type="danger"
+          con="el-icon-delete-solid"
+          lass="btnItem bgred"
+          @click="BatchDelete"
+        >
           一键解绑
         </el-button>
-        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
+        <el-button
+          type="primary"
+          icon="el-icon-folder-opened"
+          class="btnItem"
+          @click="exportToExcel"
+        >
           导出
         </el-button>
-        <el-button type="primary" @click="Upgrade">
-          一键固件升级
-        </el-button>
+        <el-button type="primary" @click="Upgrade"> 一键固件升级 </el-button>
       </div>
     </div>
     <el-table
@@ -85,73 +133,48 @@
       v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
-      :header-cell-style="{'text-align': 'center' ,background:'  #2483b3',color:'white'}"
-      :row-style="{'text-align': 'center'}"
+      :header-cell-style="{
+        'text-align': 'center',
+        background: '  #2483b3',
+        color: 'white',
+      }"
+      :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
     >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
+      <el-table-column type="selection" width="55" />
       <!-- <el-table-column
         type="index"
         width="55"
         label="编号"
       /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="snCode"
-        label="SN码"
-      />
-      <el-table-column
-        prop="brandName"
-        label="设备品牌"
-      />
-      <el-table-column
-        prop="productCode"
-        label="设备型号"
-      />
-      <el-table-column
-        prop="createTime"
-        label="生产日期"
-      />
-      <el-table-column
-        prop="deviceStatus"
-        label="设备状态"
-      >
+      <el-table-column prop="snCode" label="SN码" />
+      <el-table-column prop="brandName" label="设备品牌" />
+      <el-table-column prop="productCode" label="设备型号" />
+      <el-table-column prop="createTime" label="生产日期" />
+      <el-table-column prop="deviceStatus" label="设备状态">
         <template slot-scope="scope">
           <!-- {{scope.deviceStatus=='1'}} -->
           <!-- {{scope.row.deviceStatus=='1'}} -->
-          {{ scope.row.deviceStatus=='1'?'在线':'离线' }}
+          {{ scope.row.deviceStatus == "1" ? "在线" : "离线" }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceActiveTime"
-        label="激活时间"
-      />
-      <el-table-column
-        prop="deviceActive"
-        label="是否激活"
-      >
+      <el-table-column prop="deviceActiveTime" label="激活时间" />
+      <el-table-column prop="deviceActive" label="是否激活">
         <template slot-scope="scope">
-          {{ scope.row.deviceActive=='1'?'是':'否' }}
+          {{ scope.row.deviceActive == "1" ? "是" : "否" }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceBindUser"
-        label="是否用户绑定设备"
-      >
+      <el-table-column prop="deviceBindUser" label="是否用户绑定设备">
         <template slot-scope="scope">
-          {{ scope.row.deviceBindUser=='1'?'是':'否' }}
+          {{ scope.row.deviceBindUser == "1" ? "是" : "否" }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-      >
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
@@ -160,74 +183,91 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
-    <device-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
+    <group-page
+      v-model="isFristPage"
+      :limit="limit"
+      :total="total"
+      :offset="offset"
+      :count="tableData.total"
+      @setOffset="setOffset"
+      @setLimit="setLimit"
+    />
+    <device-info-dialog
+      :is-show-info="isShowInfo"
+      :data-info="rowInfo"
+      @close="closeInfo"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import DataInfoItem from '../../components/mycomponent/DataInfoItem.vue'
-import deviceInfoDialog from '../../components/mycomponent/dialog/deviceInfoDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import DataInfoItem from "../../components/mycomponent/DataInfoItem.vue";
+import deviceInfoDialog from "../../components/mycomponent/dialog/deviceInfoDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade, d_listExport } from '../../api/product/device'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { SelectList } from '../../api/product/brand'
-import { exportFile } from '@/utils/exportutils'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import {
+  d_listPage,
+  d_statistics,
+  d_unbind,
+  d_firmwareUpgrade,
+  d_listExport,
+} from "../../api/product/device";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { SelectList } from "../../api/product/brand";
+import { exportFile } from "@/utils/exportutils";
 import { export_json_to_excel } from "../../utils/Export2Excel";
 export default {
   components: {
     DataInfoItem,
     deviceInfoDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       statistics: {},
       dataInfo: {}, // 新数据的chushixiang
-      selectInfo: { // 搜索框中的数据的数据
-        snCode: '',
-        productCode: '',
-        brandName: '',
-        deviceStatus: '',
-        deviceBindUser: ''
+      selectInfo: {
+        // 搜索框中的数据的数据
+        snCode: "",
+        productCode: "",
+        brandName: "",
+        deviceStatus: "",
+        deviceBindUser: "",
       },
       brandList: [],
       DevState: [
-
         {
-          label: '在线',
-          value: '1'
+          label: "在线",
+          value: "1",
         },
         {
-          label: '离线',
-          value: '0'
-        }
+          label: "离线",
+          value: "0",
+        },
       ],
       userBind: [
         {
-          label: '是',
-          value: '1'
+          label: "是",
+          value: "1",
         },
         {
-          label: '否',
-          value: '0'
-        }
-      ]
-
-    }
+          label: "否",
+          value: "0",
+        },
+      ],
+    };
   },
   mounted() {
     // 相关状态获取
-    d_statistics().then(res => {
-      this.statistics = res
-    })
-    SelectList().then(res => {
-      this.brandList = res
-    })
+    d_statistics().then((res) => {
+      this.statistics = res;
+    });
+    SelectList().then((res) => {
+      this.brandList = res;
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
@@ -240,97 +280,103 @@
     // },
     // 获取指定页面
     getListPage(limit, offset) {
-      this.loading = true
-      d_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-      // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
+      this.loading = true;
+      d_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;
         })
-        this.tableData = res
-        this.loading = false
-      }).catch(_ => {
-        this.loading = false
-      })
+        .catch((_) => {
+          this.loading = false;
+        });
     },
     reset() {
       this.selectInfo = {
-        snCode: '',
-        productCode: '',
-        brandName: '',
-        deviceStatus: '',
-        deviceBindUser: ''
-      }
-      this.queryInfo = { ...this.selectInfo }
-      this.refresh()
+        snCode: "",
+        productCode: "",
+        brandName: "",
+        deviceStatus: "",
+        deviceBindUser: "",
+      };
+      this.queryInfo = { ...this.selectInfo };
+      this.refresh();
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      d_unbind({ deviceIds: ids }).then(res => {
-        this.$message({
-          message: res || '解绑成功',
-          type: 'success'
-        })
-        this.refresh()
-      }).catch(_ => {
-
-      })
+      if (this.$refs.multipleTable.selection.length) {
+        //  得到选中行
+        const dle_ary = this.$refs.multipleTable.selection;
+        const ids = [];
+        dle_ary.forEach((ele) => {
+          ids.push(ele.id);
+        });
+        d_unbind({ deviceIds: ids })
+          .then((res) => {
+            this.$message({
+              message: res || "解绑成功",
+              type: "success",
+            });
+            this.refresh();
+          })
+          .catch((_) => {});
+      }else{
+        this.$message.warning('请先选择需要解绑的设备')
+      }
     },
     Upgrade() {
       //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      console.log(dle_ary)
-      dle_ary.forEach(ele => {
-        ids.push(ele.deviceId)
-      })
-      d_firmwareUpgrade({ deviceIds: ids }).then(res => {
+      const dle_ary = this.$refs.multipleTable.selection;
+      const ids = [];
+      console.log(dle_ary);
+      dle_ary.forEach((ele) => {
+        ids.push(ele.deviceId);
+      });
+      d_firmwareUpgrade({ deviceIds: ids }).then((res) => {
         this.$message({
-          message: res || '升级成功',
-          type: 'success'
-        })
-        this.refresh()
-      })
+          message: res || "升级成功",
+          type: "success",
+        });
+        this.refresh();
+      });
     },
     exportToExcel() {
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
-        text: '下载中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      d_listExport(this.selectInfo).then(res => {
-        loading.close() // 关闭加载动画
-        const blob = new Blob([res.data])
-        let fileName = '设备列表.xlsx'
-        fileName = fileName.replace(/-|:| /g, '')
-        exportFile(blob, fileName)
-      })
+        text: "下载中,请稍后...",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      d_listExport(this.selectInfo).then((res) => {
+        loading.close(); // 关闭加载动画
+        const blob = new Blob([res.data]);
+        let fileName = "设备列表.xlsx";
+        fileName = fileName.replace(/-|:| /g, "");
+        exportFile(blob, fileName);
+      });
       // d_listPage("offset=1", {}).then((res) => {
       //   console.log(res.rows, "全部数据");
-        // 对数据进行加工
-        // res.rows = res.rows.map((item) => {
-        //   return {
-        //     产品名称: item.productName,
-        //     产品品牌: item.brandName,
-        //     产品型号: item.productCode,
-        //     产品品类: item.categoryStr,
-        //     产品颜色: item.productColor,
-        //     产品材质: item.productMaterialQuality,
-        //     产品状态: item.productStatus,
-        //     产品版本: item.productEdition,
-        //     规格: item.productPackageSize,
-        //     重量: item.productWeight,
-        //     国际69码: item.internationalCode,
-        //     更新时间: item.updateTime,
-        //   };
-        // });
+      // 对数据进行加工
+      // res.rows = res.rows.map((item) => {
+      //   return {
+      //     产品名称: item.productName,
+      //     产品品牌: item.brandName,
+      //     产品型号: item.productCode,
+      //     产品品类: item.categoryStr,
+      //     产品颜色: item.productColor,
+      //     产品材质: item.productMaterialQuality,
+      //     产品状态: item.productStatus,
+      //     产品版本: item.productEdition,
+      //     规格: item.productPackageSize,
+      //     重量: item.productWeight,
+      //     国际69码: item.internationalCode,
+      //     更新时间: item.updateTime,
+      //   };
+      // });
       //   this.ExportTable = res.rows;
       //   const header = Object.keys(res.rows[0]);
       //   console.log(header);
@@ -352,13 +398,12 @@
       //     filename: "设备列表",
       //   });
       // });
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-
 .product_container {
   position: relative;
   width: 100%;
@@ -393,7 +438,6 @@
         // width: 84px;
         //font-size: 16px;
       }
-
     }
   }
 }
diff --git a/src/views/system/certification.vue b/src/views/system/certification.vue
index f31a5c7..9e682e3 100644
--- a/src/views/system/certification.vue
+++ b/src/views/system/certification.vue
@@ -79,7 +79,8 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
+      <el-table-column prop="index" label="序号" width="50" />
+      <el-table-column prop="qualifyCode" label="资质编号" />
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="qualifyName" label="资质要求名称" />
       <el-table-column prop="qualifyDesc" label="资质要求描述" />
@@ -87,25 +88,13 @@
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="showInfo(scope.row)"
-          >
+          <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="compile(scope.row)"
-          >
+          <el-button type="text" size="small" @click="compile(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Cdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Cdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -138,10 +127,10 @@
     />
     <!-- 详情 -->
 
-    <category-info-dialog
-      :is-show-info="isShowInfo"
+    <CertificationInfoDlalog
+      :is-show-info="isshowDetail"
       :data-info="rowInfo"
-      @close="closeInfo"
+      :Detailclose="closeDetail"
     />
   </div>
 </template>
@@ -149,36 +138,36 @@
 <script>
 // 组件
 
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import {
-  listPage,
-  batchDelete,
-  Cdelete
-} from '../../api/system/certification'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
-import CertificationAddDlalog from '../../components/mycomponent/dialog/certification/certificationAddDlalog.vue'
-
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listPage, batchDelete, Cdelete } from "../../api/system/certification";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import CertificationAddDlalog from "../../components/mycomponent/dialog/certification/certificationAddDlalog.vue";
+import CertificationInfoDlalog from "../../components/mycomponent/dialog/certification/certificationInfoDlalog.vue";
+export default {
+  // 加入分页逻辑
   components: {
     GroupPage,
-    CertificationAddDlalog
+    CertificationAddDlalog,
+    CertificationInfoDlalog,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
-      title: '', // 弹框标题
+      title: "", // 弹框标题
       dataInfo: {}, // 编辑 ， 新增数据
       isShowAdd: false, // 显示新增， 编辑
+      isShowdetail: false, //详情 显示
+      rowInfo:{},
       selectInfo: {
         // 搜索框中的数据的数据
-        qualifyCode: '',
-        qualifyName: ''
-      }
-    }
+        qualifyCode: "",
+        qualifyName: "",
+      },
+    };
   },
   mounted() {
     // 获取品类列表
@@ -186,21 +175,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
 
     addCategory() {
-      this.isShowAdd = true
-      this.dataInfo = ''
-      this.title = '新增资质要求'
+      this.isShowAdd = true;
+      this.dataInfo = "";
+      this.title = "新增资质要求";
     },
     reset() {
       this.selectInfo = {
-        qualifyCode: '',
-        qualifyName: ''
-      }
+        qualifyCode: "",
+        qualifyName: "",
+      };
       // this.queryInfo = { ...this.selectInfo}
+      listPage(`limit=${10}&offset=${1}`, {}).then((res) => {
+        // 得到相关数据
+        res.rows.forEach((item, index) => {
+          item.index = index + 1 + (1 - 1) * 10;
+        });
+        this.tableData = res;
+      });
     },
     // 获取指定页面
     getListPage(limit, offset) {
@@ -208,63 +204,94 @@
         (res) => {
           // 得到相关数据
           res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10
-          })
-          this.tableData = res
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
         }
-      )
+      );
     },
     // 删除
     Cdelete(row) {
-      const id = row.id
-      Cdelete({ id: id }).then((res) => {
-        //  删除成功 跟新列表
-        if (res != '') {
+      this.$confirm("确认删除此项数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then((res) => {
+        const id = row.id;
+        Cdelete({ id: id }).then((res) => {
+          //  删除成功 跟新列表
           this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
-      })
+            message: "删除成功",
+            type: "success",
+          });
+          this.refresh();
+        });
+      });
     },
     //  批量删除
     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'
-          })
-          this.refresh()
-        }
-      })
+      if (this.$refs.multipleTable.selection.length) {
+        this.$confirm("确认删除选中的这些数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then((res) => {
+          //  得到选中行
+          const dle_ary = this.$refs.multipleTable.selection;
+          const ids = [];
+          dle_ary.forEach((ele) => {
+            ids.push(ele.id);
+          });
+          batchDelete({ ids: ids }).then((res) => {
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        });
+      } else {
+        this.$message.warning("请先选择需要删除的数据");
+      }
     },
     //  编辑
     compile(row) {
-      console.log(row)
-      this.isShowAdd = true
-      this.title = '编辑'
-      this.dataInfo = row
+      this.isShowAdd = true;
+      this.title = "编辑";
+      this.dataInfo = row;
+    },
+    //  详情
+    showInfo(row) {
+      this.rowInfo = row
+      this.isshowDetail = true
+      this.title = "详情";
+      console.log(this.isshowDetail)
+    },
+    closeDetail(row) {
+      console.log(456)
+      this.isshowDetail = false
     },
     exportToExcel() {
-      listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.rows)
-      })
-    }
-  }
-}
+      listPage("limit=1000000000&offset=1", {}).then((res) => {
+        res.rows = res.rows.map((item, index) => {
+          return {
+            序号: index + 1,
+            资质编号: item.qualifyCode,
+            资质要求名称: item.qualifyName,
+            资质要求描述: item.qualifyDesc,
+            证明材料: item.proveMaterialDesc,
+            备注: item.remark,
+          };
+        });
+        outToExcel(res.rows, "资质管理");
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-
-.el-form-item__label{
+.el-form-item__label {
   width: 115px;
   text-align: inherit;
   line-height: 21px !important;
@@ -301,7 +328,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
   .footer {