diff --git a/src/components/echart/radarChart/baseRadarChart.vue b/src/components/echart/radarChart/baseRadarChart.vue
index bd590d6..076679c 100644
--- a/src/components/echart/radarChart/baseRadarChart.vue
+++ b/src/components/echart/radarChart/baseRadarChart.vue
@@ -52,8 +52,8 @@
         legend: {
           type: "plain",
           orient: "horizontal",
-          bottom: "auto",
           top: "bottom",
+          left:'5%',
           itemWidth: 12,
           itemHeight: 12,
           icon: "rect",

diff --git a/src/components/echart/radarChart/baseRadarChart.vue b/src/components/echart/radarChart/baseRadarChart.vue
index bd590d6..076679c 100644
--- a/src/components/echart/radarChart/baseRadarChart.vue
+++ b/src/components/echart/radarChart/baseRadarChart.vue
@@ -52,8 +52,8 @@
         legend: {
           type: "plain",
           orient: "horizontal",
-          bottom: "auto",
           top: "bottom",
+          left:'5%',
           itemWidth: 12,
           itemHeight: 12,
           icon: "rect",
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index d06f821..7b2ef09 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -12,12 +12,12 @@
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="编号" prop="categoryCode">
-              <el-input v-model="categoryInfo.categoryCode" placeholder="必填" />
+              <el-input v-model.trim="categoryInfo.categoryCode" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="名称" prop="categoryName">
-              <el-input v-model="categoryInfo.categoryName" placeholder="必填" />
+              <el-input v-model.trim="categoryInfo.categoryName" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -62,7 +62,7 @@
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input
-                v-model="categoryInfo.remark"
+                v-mode.triml="categoryInfo.remark"
                 type="textarea"
                 :rows="3"
                 placeholder="请输入内容"
@@ -79,7 +79,7 @@
           <div style="padding: 15px 20px">
             <div v-for=" (item,index) of categoryInfo.productParams" :key="index" class="addItem">
               <el-form-item label="名称" :prop="`productParams[${index}].paramName`" :rules="{required: true, message: `请输入名称`, trigger: ['change','blur']}" label-width="60px">
-                <el-input v-model="item.paramName" placeholder="必填" />
+                <el-input v-model.trim="item.paramName" placeholder="必填" />
               </el-form-item>
               <el-form-item label="排序" :prop="`productParams[${index}].paramOrder`" :rules="{required: true, message: `请输入排序`, trigger: ['change','blur']}" label-width="60px">
                 <el-input-number v-model="item.paramOrder" :min="0" :max="9999" />
@@ -176,6 +176,7 @@
       } else {
         if (!row.id) return
         detail({ id: row.id }).then(res => {
+          console.log(res.data, 'row')
           this.categoryInfo = {
             id: res.data.id,
             categoryCode: res.data.categoryCode,

diff --git a/src/components/echart/radarChart/baseRadarChart.vue b/src/components/echart/radarChart/baseRadarChart.vue
index bd590d6..076679c 100644
--- a/src/components/echart/radarChart/baseRadarChart.vue
+++ b/src/components/echart/radarChart/baseRadarChart.vue
@@ -52,8 +52,8 @@
         legend: {
           type: "plain",
           orient: "horizontal",
-          bottom: "auto",
           top: "bottom",
+          left:'5%',
           itemWidth: 12,
           itemHeight: 12,
           icon: "rect",
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index d06f821..7b2ef09 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -12,12 +12,12 @@
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="编号" prop="categoryCode">
-              <el-input v-model="categoryInfo.categoryCode" placeholder="必填" />
+              <el-input v-model.trim="categoryInfo.categoryCode" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="名称" prop="categoryName">
-              <el-input v-model="categoryInfo.categoryName" placeholder="必填" />
+              <el-input v-model.trim="categoryInfo.categoryName" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -62,7 +62,7 @@
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input
-                v-model="categoryInfo.remark"
+                v-mode.triml="categoryInfo.remark"
                 type="textarea"
                 :rows="3"
                 placeholder="请输入内容"
@@ -79,7 +79,7 @@
           <div style="padding: 15px 20px">
             <div v-for=" (item,index) of categoryInfo.productParams" :key="index" class="addItem">
               <el-form-item label="名称" :prop="`productParams[${index}].paramName`" :rules="{required: true, message: `请输入名称`, trigger: ['change','blur']}" label-width="60px">
-                <el-input v-model="item.paramName" placeholder="必填" />
+                <el-input v-model.trim="item.paramName" placeholder="必填" />
               </el-form-item>
               <el-form-item label="排序" :prop="`productParams[${index}].paramOrder`" :rules="{required: true, message: `请输入排序`, trigger: ['change','blur']}" label-width="60px">
                 <el-input-number v-model="item.paramOrder" :min="0" :max="9999" />
@@ -176,6 +176,7 @@
       } else {
         if (!row.id) return
         detail({ id: row.id }).then(res => {
+          console.log(res.data, 'row')
           this.categoryInfo = {
             id: res.data.id,
             categoryCode: res.data.categoryCode,
diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue
index 9248d81..0ab968d 100644
--- a/src/views/dashboard/components/managementList.vue
+++ b/src/views/dashboard/components/managementList.vue
@@ -65,7 +65,7 @@
   
  
   .device {
-    width:24%;
+    width:30%;
     .content {
       display: flex;
       justify-content: space-around;
@@ -73,6 +73,7 @@
       align-items: center;
       .count{
         font-size: 20px;
+        margin-right: 40px;
       }
       ::v-deep .svg-icon {
         width: 40px;

diff --git a/src/components/echart/radarChart/baseRadarChart.vue b/src/components/echart/radarChart/baseRadarChart.vue
index bd590d6..076679c 100644
--- a/src/components/echart/radarChart/baseRadarChart.vue
+++ b/src/components/echart/radarChart/baseRadarChart.vue
@@ -52,8 +52,8 @@
         legend: {
           type: "plain",
           orient: "horizontal",
-          bottom: "auto",
           top: "bottom",
+          left:'5%',
           itemWidth: 12,
           itemHeight: 12,
           icon: "rect",
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index d06f821..7b2ef09 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -12,12 +12,12 @@
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="编号" prop="categoryCode">
-              <el-input v-model="categoryInfo.categoryCode" placeholder="必填" />
+              <el-input v-model.trim="categoryInfo.categoryCode" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="名称" prop="categoryName">
-              <el-input v-model="categoryInfo.categoryName" placeholder="必填" />
+              <el-input v-model.trim="categoryInfo.categoryName" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -62,7 +62,7 @@
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input
-                v-model="categoryInfo.remark"
+                v-mode.triml="categoryInfo.remark"
                 type="textarea"
                 :rows="3"
                 placeholder="请输入内容"
@@ -79,7 +79,7 @@
           <div style="padding: 15px 20px">
             <div v-for=" (item,index) of categoryInfo.productParams" :key="index" class="addItem">
               <el-form-item label="名称" :prop="`productParams[${index}].paramName`" :rules="{required: true, message: `请输入名称`, trigger: ['change','blur']}" label-width="60px">
-                <el-input v-model="item.paramName" placeholder="必填" />
+                <el-input v-model.trim="item.paramName" placeholder="必填" />
               </el-form-item>
               <el-form-item label="排序" :prop="`productParams[${index}].paramOrder`" :rules="{required: true, message: `请输入排序`, trigger: ['change','blur']}" label-width="60px">
                 <el-input-number v-model="item.paramOrder" :min="0" :max="9999" />
@@ -176,6 +176,7 @@
       } else {
         if (!row.id) return
         detail({ id: row.id }).then(res => {
+          console.log(res.data, 'row')
           this.categoryInfo = {
             id: res.data.id,
             categoryCode: res.data.categoryCode,
diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue
index 9248d81..0ab968d 100644
--- a/src/views/dashboard/components/managementList.vue
+++ b/src/views/dashboard/components/managementList.vue
@@ -65,7 +65,7 @@
   
  
   .device {
-    width:24%;
+    width:30%;
     .content {
       display: flex;
       justify-content: space-around;
@@ -73,6 +73,7 @@
       align-items: center;
       .count{
         font-size: 20px;
+        margin-right: 40px;
       }
       ::v-deep .svg-icon {
         width: 40px;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index f3f8011..ef21e99 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -31,7 +31,7 @@
             </el-form-item>
             <el-form-item prop="password" label="密码:">
               <el-input v-model.trim="loginForm.password" :type="pwdType" name="password" auto-complete="on"
-                placeholder="密码" @keyup.enter.native="handleLogin">
+                placeholder="密码" @keyup.enter.native="handleLogin" style="width: 217px">
                 <!-- <span slot="prefix" class="input-prefix-icon">
                 <svg-icon icon-class="password" />
               </span> -->

diff --git a/src/components/echart/radarChart/baseRadarChart.vue b/src/components/echart/radarChart/baseRadarChart.vue
index bd590d6..076679c 100644
--- a/src/components/echart/radarChart/baseRadarChart.vue
+++ b/src/components/echart/radarChart/baseRadarChart.vue
@@ -52,8 +52,8 @@
         legend: {
           type: "plain",
           orient: "horizontal",
-          bottom: "auto",
           top: "bottom",
+          left:'5%',
           itemWidth: 12,
           itemHeight: 12,
           icon: "rect",
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index d06f821..7b2ef09 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -12,12 +12,12 @@
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="编号" prop="categoryCode">
-              <el-input v-model="categoryInfo.categoryCode" placeholder="必填" />
+              <el-input v-model.trim="categoryInfo.categoryCode" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="名称" prop="categoryName">
-              <el-input v-model="categoryInfo.categoryName" placeholder="必填" />
+              <el-input v-model.trim="categoryInfo.categoryName" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -62,7 +62,7 @@
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input
-                v-model="categoryInfo.remark"
+                v-mode.triml="categoryInfo.remark"
                 type="textarea"
                 :rows="3"
                 placeholder="请输入内容"
@@ -79,7 +79,7 @@
           <div style="padding: 15px 20px">
             <div v-for=" (item,index) of categoryInfo.productParams" :key="index" class="addItem">
               <el-form-item label="名称" :prop="`productParams[${index}].paramName`" :rules="{required: true, message: `请输入名称`, trigger: ['change','blur']}" label-width="60px">
-                <el-input v-model="item.paramName" placeholder="必填" />
+                <el-input v-model.trim="item.paramName" placeholder="必填" />
               </el-form-item>
               <el-form-item label="排序" :prop="`productParams[${index}].paramOrder`" :rules="{required: true, message: `请输入排序`, trigger: ['change','blur']}" label-width="60px">
                 <el-input-number v-model="item.paramOrder" :min="0" :max="9999" />
@@ -176,6 +176,7 @@
       } else {
         if (!row.id) return
         detail({ id: row.id }).then(res => {
+          console.log(res.data, 'row')
           this.categoryInfo = {
             id: res.data.id,
             categoryCode: res.data.categoryCode,
diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue
index 9248d81..0ab968d 100644
--- a/src/views/dashboard/components/managementList.vue
+++ b/src/views/dashboard/components/managementList.vue
@@ -65,7 +65,7 @@
   
  
   .device {
-    width:24%;
+    width:30%;
     .content {
       display: flex;
       justify-content: space-around;
@@ -73,6 +73,7 @@
       align-items: center;
       .count{
         font-size: 20px;
+        margin-right: 40px;
       }
       ::v-deep .svg-icon {
         width: 40px;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index f3f8011..ef21e99 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -31,7 +31,7 @@
             </el-form-item>
             <el-form-item prop="password" label="密码:">
               <el-input v-model.trim="loginForm.password" :type="pwdType" name="password" auto-complete="on"
-                placeholder="密码" @keyup.enter.native="handleLogin">
+                placeholder="密码" @keyup.enter.native="handleLogin" style="width: 217px">
                 <!-- <span slot="prefix" class="input-prefix-icon">
                 <svg-icon icon-class="password" />
               </span> -->
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 80a22b2..8767f49 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -82,7 +82,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <!--      <el-table-column type="index" label="序号" />-->
+      <el-table-column type="index" label="序号" width="60" />
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />

diff --git a/src/components/echart/radarChart/baseRadarChart.vue b/src/components/echart/radarChart/baseRadarChart.vue
index bd590d6..076679c 100644
--- a/src/components/echart/radarChart/baseRadarChart.vue
+++ b/src/components/echart/radarChart/baseRadarChart.vue
@@ -52,8 +52,8 @@
         legend: {
           type: "plain",
           orient: "horizontal",
-          bottom: "auto",
           top: "bottom",
+          left:'5%',
           itemWidth: 12,
           itemHeight: 12,
           icon: "rect",
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index d06f821..7b2ef09 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -12,12 +12,12 @@
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="编号" prop="categoryCode">
-              <el-input v-model="categoryInfo.categoryCode" placeholder="必填" />
+              <el-input v-model.trim="categoryInfo.categoryCode" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="名称" prop="categoryName">
-              <el-input v-model="categoryInfo.categoryName" placeholder="必填" />
+              <el-input v-model.trim="categoryInfo.categoryName" placeholder="必填" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -62,7 +62,7 @@
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input
-                v-model="categoryInfo.remark"
+                v-mode.triml="categoryInfo.remark"
                 type="textarea"
                 :rows="3"
                 placeholder="请输入内容"
@@ -79,7 +79,7 @@
           <div style="padding: 15px 20px">
             <div v-for=" (item,index) of categoryInfo.productParams" :key="index" class="addItem">
               <el-form-item label="名称" :prop="`productParams[${index}].paramName`" :rules="{required: true, message: `请输入名称`, trigger: ['change','blur']}" label-width="60px">
-                <el-input v-model="item.paramName" placeholder="必填" />
+                <el-input v-model.trim="item.paramName" placeholder="必填" />
               </el-form-item>
               <el-form-item label="排序" :prop="`productParams[${index}].paramOrder`" :rules="{required: true, message: `请输入排序`, trigger: ['change','blur']}" label-width="60px">
                 <el-input-number v-model="item.paramOrder" :min="0" :max="9999" />
@@ -176,6 +176,7 @@
       } else {
         if (!row.id) return
         detail({ id: row.id }).then(res => {
+          console.log(res.data, 'row')
           this.categoryInfo = {
             id: res.data.id,
             categoryCode: res.data.categoryCode,
diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue
index 9248d81..0ab968d 100644
--- a/src/views/dashboard/components/managementList.vue
+++ b/src/views/dashboard/components/managementList.vue
@@ -65,7 +65,7 @@
   
  
   .device {
-    width:24%;
+    width:30%;
     .content {
       display: flex;
       justify-content: space-around;
@@ -73,6 +73,7 @@
       align-items: center;
       .count{
         font-size: 20px;
+        margin-right: 40px;
       }
       ::v-deep .svg-icon {
         width: 40px;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index f3f8011..ef21e99 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -31,7 +31,7 @@
             </el-form-item>
             <el-form-item prop="password" label="密码:">
               <el-input v-model.trim="loginForm.password" :type="pwdType" name="password" auto-complete="on"
-                placeholder="密码" @keyup.enter.native="handleLogin">
+                placeholder="密码" @keyup.enter.native="handleLogin" style="width: 217px">
                 <!-- <span slot="prefix" class="input-prefix-icon">
                 <svg-icon icon-class="password" />
               </span> -->
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 80a22b2..8767f49 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -82,7 +82,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <!--      <el-table-column type="index" label="序号" />-->
+      <el-table-column type="index" label="序号" width="60" />
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 4ee9765..0cf79bc 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -4,16 +4,31 @@
     <div class="product-inputs">
       <div style="margin-top: 10px">
         <span>产品型号</span>
-        <el-input v-model="listQuery.productCode" placeholder="请输入产品型号" clearable class="product-input" />
+        <el-input
+          v-model.trim="listQuery.productCode"
+          placeholder="请输入产品型号"
+          clearable
+          class="product-input"
+        />
         <span>产品名称</span>
-        <el-input v-model="listQuery.productName" placeholder="请输入产品名称" clearable class="product-input" />
+        <el-input
+          v-model.trim="listQuery.productName"
+          placeholder="请输入产品名称"
+          clearable
+          class="product-input"
+        />
         <span>产品品类</span>
-        <el-select v-model="listQuery.categoryId" class="product-select" filterable placeholder="请选择产品品类">
+        <el-select
+          v-model="listQuery.categoryId"
+          class="product-select"
+          filterable
+          placeholder="请选择产品品类"
+        >
           <el-option
             v-for="item in categoryList"
-            :key="item.categoryId"
+            :key="item.id"
             :label="item.categoryName"
-            :value="item.categoryId"
+            :value="item.id"
           />
         </el-select>
       </div>
@@ -24,13 +39,25 @@
         <el-button type="primary" icon="el-icon-refresh-right" @click="reset">
           重置
         </el-button>
-        <el-button type="danger" icon="el-icon-delete" @click="BatchDeleteClick">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          @click="BatchDeleteClick"
+        >
           删除
         </el-button>
-        <el-button type="success" icon="el-icon-circle-plus-outline" @click="addDialog">
+        <el-button
+          type="success"
+          icon="el-icon-circle-plus-outline"
+          @click="addDialog"
+        >
           新增
         </el-button>
-        <el-button type="primary" icon="el-icon-folder-opened" @click="exportToExcel">
+        <el-button
+          type="primary"
+          icon="el-icon-folder-opened"
+          @click="exportToExcel"
+        >
           导出
         </el-button>
       </div>
@@ -46,22 +73,60 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <!--        <el-table-column type="index" label="编号" width="55" />-->
+        <el-table-column type="index" label="编号" width="60" />
         <!--        <el-table-column header-align="center" align="center" prop="id" label="序号" />-->
-        <el-table-column header-align="center" align="center" prop="productCode" label="产品型号" />
-        <el-table-column header-align="center" align="center" prop="productName" label="产品名称" />
-        <el-table-column header-align="center" align="center" prop="brandName" label="产品品牌" />
-        <el-table-column header-align="center" align="center" prop="categoryId" label="产品品类" />
-        <el-table-column header-align="center" align="center" prop="internationalCode" label="国际69码" />
-        <el-table-column header-align="center" align="center" fixed="right" label="操作">
+        <el-table-column
+          header-align="center"
+          align="center"
+          prop="productCode"
+          label="产品型号"
+        />
+        <el-table-column
+          header-align="center"
+          align="center"
+          prop="productName"
+          label="产品名称"
+        />
+        <el-table-column
+          header-align="center"
+          align="center"
+          prop="brandName"
+          label="产品品牌"
+        />
+        <el-table-column
+          header-align="center"
+          align="center"
+          prop="categoryStr"
+          label="产品品类"
+        />
+        <el-table-column
+          header-align="center"
+          align="center"
+          prop="internationalCode"
+          label="国际69码"
+        />
+        <el-table-column
+          header-align="center"
+          align="center"
+          fixed="right"
+          label="操作"
+        >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleDetail(scope.row)">
+            <el-button
+              type="text"
+              size="small"
+              @click="handleDetail(scope.row)"
+            >
               查看
             </el-button>
             <el-button type="text" size="small" @click="handleClick(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" size="small" @click="handleDelete(scope.row)">
+            <el-button
+              type="text"
+              size="small"
+              @click="handleDelete(scope.row)"
+            >
               删除
             </el-button>
             <el-button type="text" size="small" @click="handleBind(scope.row)">
@@ -79,32 +144,55 @@
         @setLimit="setLimit"
       />
     </div>
-    <productDetailDialog ref="detailDialog" :data-info="dataInfo" @close="DetailDialogClose" />
-    <product-list-add-dialog v-show="isShowDialog" ref="addProduct" :title="dialogTitle" @close="addDialogClose" @refresh="refresh" />
-    <productBindDialog ref="bindDialog" :data-info="dataInfo" @close="BindDialogClose" />
+    <productDetailDialog
+      ref="detailDialog"
+      :data-info="dataInfo"
+      @close="DetailDialogClose"
+    />
+    <product-list-add-dialog
+      v-show="isShowDialog"
+      ref="addProduct"
+      :title="dialogTitle"
+      @close="addDialogClose"
+      @refresh="refresh"
+    />
+    <productBindDialog
+      ref="bindDialog"
+      :data-info="dataInfo"
+      @close="BindDialogClose"
+    />
   </div>
 </template>
 
 <script>
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listPage, productDelete, batchDelete, list, d_firmwareUpgrade } from '../../api/product/product'
-import { C_list } from '../../api/product/category'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import {
+  listPage,
+  productDelete,
+  batchDelete,
+  list,
+  d_firmwareUpgrade,
+} from "../../api/product/product";
+import { C_list } from "../../api/product/category";
 
-import { export_json_to_excel } from '../../utils/Export2Excel'
-import productListAddDialog from '../../components/mycomponent/dialog/productListAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
-import productDetailDialog from '../../components/mycomponent/dialog/productDetailDialog.vue'
-import productBindDialog from '../../components/mycomponent/dialog/productBindDialog.vue'
+import { export_json_to_excel } from "../../utils/Export2Excel";
+import productListAddDialog from "../../components/mycomponent/dialog/productListAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
+import productDetailDialog from "../../components/mycomponent/dialog/productDetailDialog.vue";
+import productBindDialog from "../../components/mycomponent/dialog/productBindDialog.vue";
 export default {
   components: {
-    productListAddDialog, GroupPage, productDetailDialog, productBindDialog
+    productListAddDialog,
+    GroupPage,
+    productDetailDialog,
+    productBindDialog,
   },
   data() {
     return {
       listQuery: {
-        productCode: '',
-        productName: '',
-        categoryId: ''
+        productCode: "",
+        productName: "",
+        categoryId: "",
       },
       categoryList: [], // 品类列表
       dataInfo: {}, // 当前行的数据
@@ -114,163 +202,192 @@
       isShowDialog: false,
       isShowDetail: false,
       isBindShow: false,
-      dialogTitle: '',
-      value: '',
-      input: '',
-      options: [{ label: '热水器类', value: '热水器类' }],
+      dialogTitle: "",
+      value: "",
+      input: "",
+      options: [{ label: "热水器类", value: "热水器类" }],
       tableData: null,
       queryInfo: {},
-      ExportTable: []// 导出表格
-    }
+      ExportTable: [], // 导出表格
+      loading: false,
+    };
   },
   computed: {
     page() {
-      const index = this.total / this.limit
-      return Math.ceil(index)
-    }
+      const index = this.total / this.limit;
+      return Math.ceil(index);
+    },
   },
   watch: {
     limit(newVls) {
-      this.limit = newVls
-      this.getProductList()
+      this.limit = newVls;
+      this.getProductList();
     },
     offset(newVls) {
-      this.offset = newVls
-      this.getProductList()
-    }
+      this.offset = newVls;
+      this.getProductList();
+    },
   },
   mounted() {
-    const params = {
-      categoryCode: '',
-      categoryName: ''
-    }
-    C_list(params).then(res => {
-      this.categoryList = res.data
-    })
-    this.refresh()
+    // const params = {
+    //   categoryCode: "",
+    //   categoryName: "",
+    //   categoryId:""
+    // };
+    C_list(this.listQuery).then((res) => {
+      this.categoryList = res.data;
+      console.log(this.categoryList, "品牌列表");
+    });
+    this.refresh();
   },
   methods: {
     // 改变行的样式
     tableRowClassName: tableRowClassName,
     addDialog() {
-      this.isShowDialog = true
-      this.dialogTitle = '新增产品'
-      this.$refs.addProduct.initDialog('add')
+      this.isShowDialog = true;
+      this.dialogTitle = "新增产品";
+      this.$refs.addProduct.initDialog("add");
     },
     getProductList() {
-      this.loading = true
-      listPage(`limit=${this.limit}&offset=${this.offset}`, this.listQuery).then(res => {
-        this.tableData = res.rows
-        this.total = res.total
-        this.loading = false
-      })
+      this.loading = true;
+      listPage(
+        `limit=${this.limit}&offset=${this.offset}`,
+        this.listQuery
+      ).then((res) => {
+        this.tableData = res.rows;
+        this.total = res.total;
+        this.loading = false;
+      });
     },
     setLimit(crrentSize) {
-      this.limit = crrentSize
+      this.limit = crrentSize;
     },
     setOffset(offset) {
-      this.offset = offset
+      this.offset = offset;
     },
     // 刷新
     refresh() {
-      this.getProductList()
+      this.getProductList();
     },
     // 编辑
     handleClick(row) {
-      console.log(row)
-      this.isShowDialog = true
-      this.dialogTitle = '编辑产品'
-      this.$refs.addProduct.initDialog('edit', row)
+      console.log(row);
+      this.isShowDialog = true;
+      this.dialogTitle = "编辑产品";
+      this.$refs.addProduct.initDialog("edit", row);
     },
     // 详情
     handleDetail(row) {
-      this.isShowDetail = true
-      this.dataInfo = row
-      this.$refs.detailDialog.initDialog(row.id)
+      this.isShowDetail = true;
+      this.dataInfo = row;
+      this.$refs.detailDialog.initDialog(row.id);
     },
     DetailDialogClose() {
-      this.isShowDetail = false
+      this.isShowDetail = false;
     },
     // 搜索
     searchClick() {
-      this.offset = 1
-      this.refresh()
+      this.offset = 1;
+      this.getProductList();
     },
     // 重置
     reset() {
-      this.productName = ''
-      this.productType = ''
-      this.productCategory = ''
+      this.listQuery.productName = "";
+      this.listQuery.productCode = "";
+      this.listQuery.categoryId = "";
       this.queryInfo = {
-        productName: '',
-        productCode: '',
-        categoryId: ''
-      }
-      this.refresh()
+        productName: "",
+        productCode: "",
+        categoryId: "",
+      };
+      this.refresh();
     },
     // 删除当前行
     handleDelete(row) {
-      productDelete({ id: row.id }).then(res => {
-        console.log(res)
-        this.refresh()
-      })
+      this.$confirm(`确认删除此产品吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        productDelete({ id: row.id }).then((res) => {
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.refresh();
+        });
+      });
     },
     // 批量删除
     BatchDeleteClick() {
-      const DelAry = this.$refs.multipleTable.selection
-      console.log(DelAry)
-      const ids = []
-      DelAry.forEach(ele => {
-        ids.push(ele.id)
-      })
-      console.log(ids)
-      batchDelete({ ids: ids }).then(res => {
-        console.log(res)
-        this.refresh()
-      })
+      if (this.$refs.multipleTable.selection.length) {
+        this.$confirm(`确认删除选中的这些产品吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          const DelAry = this.$refs.multipleTable.selection;
+          const ids = [];
+          DelAry.forEach((ele) => {
+            ids.push(ele.id);
+          });
+          console.log(ids);
+          batchDelete({ ids: ids }).then((res) => {
+            this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+            this.refresh();
+          });
+        });
+      } else {
+        this.$message({
+          message: "请先选择需要删除的产品",
+          type: "error",
+        });
+      }
     },
     addDialogClose() {
-      this.refresh()
+      this.refresh();
     },
     handleBind(row) {
-      console.log('bindService')
-      console.log(row)
-      this.dataInfo = row
-      this.$refs.bindDialog.initDialog(row)
-      this.isBindShow = true
+      console.log("bindService");
+      console.log(row);
+      this.dataInfo = row;
+      this.$refs.bindDialog.initDialog(row);
+      this.isBindShow = true;
     },
     BindDialogClose() {
-      this.isBindShow = false
+      this.isBindShow = false;
     },
     // 导出表格
     // 导出
     exportToExcel() {
-      listPage('offset=1', {}).then(res => {
-        console.log(res.rows, '全部数据')
-        this.ExportTable = res.rows
-        const header = Object.keys(res.rows[0])
-        console.log(header)
+      listPage("offset=1", {}).then((res) => {
+        console.log(res.rows, "全部数据");
+        this.ExportTable = res.rows;
+        const header = Object.keys(res.rows[0]);
+        console.log(header);
         const data = res.rows.map((user, index) => {
-          const userArr = []
-          console.log(user, index)
+          const userArr = [];
+          console.log(user, index);
           for (const key in res.rows[0]) {
             // console.log(res.rows[key]);
-            const item = user[key]
-            userArr.push(item)
+            const item = user[key];
+            userArr.push(item);
           }
-          return userArr
-        })
-        console.log(data)
+          return userArr;
+        });
+        console.log(data);
         // //把定义好的header和data放进export_json_to_excel的函数里作为参数
         export_json_to_excel({
           header,
-          data
-        })
-      })
-    }
-  }
-
-}
+          data,
+        });
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -285,7 +402,8 @@
 .product-inputs {
   display: flex;
   justify-content: space-between;
-  .product-input, .product-select {
+  .product-input,
+  .product-select {
     margin: 0px 10px;
     width: 150px;
   }
@@ -308,5 +426,4 @@
   background-color: white;
   text-align: center;
 }
-
 </style>