diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 33c1a3d..d833399 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -316,12 +316,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+      </div>
+      <div>
           <el-button class="table-btn" @click="handleAddBtn">
             添加项目需求
           </el-button>
         </div>
-      </div>
     </div>
     <div class="btnBox">
       <el-button type="primary" class="save" @click="save">
@@ -421,22 +421,27 @@
   },
   methods: {
     save() {
-      this.addInfo.productList = {
+      if(this.valiateForm()){
+        this.addInfo.productList = {
         productCode: this.addInfo.productList.productCode,
         productQuantity: this.addInfo.productList.productQuantity,
         productPrice: this.addInfo.productList.productPrice,
         productName: ''
       }
       add(this.addInfo).then(res => {
-        console.log(res)
-        if (res) {
+        this.setData()
           this.$message({
             message: '保存成功',
             type: 'success'
           })
-        }
-      })
-      this.setData()
+      }) 
+      } else {
+        this.$message({
+            message: '请先完整填写报备信息',
+            type: 'error'
+          })
+      }
+      
     },
     close() {
       this.setData()
@@ -462,7 +467,6 @@
         this.form.countyList = res
       })
     },
-
     handleAddBtn() {
       const obj = {}
       obj.brandName = ''
@@ -525,6 +529,12 @@
           this.$set(this.showEdit, index, false) // vue添加属性的方法
         }
       })
+      row.productCode = this.addInfo.productList.productCode
+      row.brandName = this.brandName
+      console.log(this.categoryIds)
+      row.categoryIds = this.categoryIds
+      row.productQuantity = this.addInfo.productList.productQuantity
+      row.productPrice = this.addInfo.productList.productPrice
     },
     setData() {
       this.addInfo = {
@@ -553,6 +563,17 @@
         agentPhone: '',
         productList: []
       }
+    },
+    valiateForm() {
+      let arr = []
+      for(var item in this.addInfo) {
+        if(this.addInfo[item]){
+          arr.push(1)
+        }else{
+          arr.push(0)
+        }
+      }
+      return arr.every(item => item === 1)
     }
   }
 }
@@ -568,7 +589,7 @@
 
   .report-from {
     .from-title {
-      font-size: 22px;
+      font-size: 16px;
       font-weight: bold;
       background-color: #28739e;
       color: white;

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 33c1a3d..d833399 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -316,12 +316,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+      </div>
+      <div>
           <el-button class="table-btn" @click="handleAddBtn">
             添加项目需求
           </el-button>
         </div>
-      </div>
     </div>
     <div class="btnBox">
       <el-button type="primary" class="save" @click="save">
@@ -421,22 +421,27 @@
   },
   methods: {
     save() {
-      this.addInfo.productList = {
+      if(this.valiateForm()){
+        this.addInfo.productList = {
         productCode: this.addInfo.productList.productCode,
         productQuantity: this.addInfo.productList.productQuantity,
         productPrice: this.addInfo.productList.productPrice,
         productName: ''
       }
       add(this.addInfo).then(res => {
-        console.log(res)
-        if (res) {
+        this.setData()
           this.$message({
             message: '保存成功',
             type: 'success'
           })
-        }
-      })
-      this.setData()
+      }) 
+      } else {
+        this.$message({
+            message: '请先完整填写报备信息',
+            type: 'error'
+          })
+      }
+      
     },
     close() {
       this.setData()
@@ -462,7 +467,6 @@
         this.form.countyList = res
       })
     },
-
     handleAddBtn() {
       const obj = {}
       obj.brandName = ''
@@ -525,6 +529,12 @@
           this.$set(this.showEdit, index, false) // vue添加属性的方法
         }
       })
+      row.productCode = this.addInfo.productList.productCode
+      row.brandName = this.brandName
+      console.log(this.categoryIds)
+      row.categoryIds = this.categoryIds
+      row.productQuantity = this.addInfo.productList.productQuantity
+      row.productPrice = this.addInfo.productList.productPrice
     },
     setData() {
       this.addInfo = {
@@ -553,6 +563,17 @@
         agentPhone: '',
         productList: []
       }
+    },
+    valiateForm() {
+      let arr = []
+      for(var item in this.addInfo) {
+        if(this.addInfo[item]){
+          arr.push(1)
+        }else{
+          arr.push(0)
+        }
+      }
+      return arr.every(item => item === 1)
     }
   }
 }
@@ -568,7 +589,7 @@
 
   .report-from {
     .from-title {
-      font-size: 22px;
+      font-size: 16px;
       font-weight: bold;
       background-color: #28739e;
       color: white;
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 4f061c8..2964d08 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -68,12 +68,11 @@
       <!-- <div>页码</div> -->
     </div>
     <!-- 新增弹框 -->
-
-    <!--    <brand-add-dialog-->
-    <!--      :isShowInfo="isShowAdd"-->
-    <!--      @close="closeAdd"-->
-    <!--    >-->
-    <!--    </brand-add-dialog>-->
+       <brand-add-dialog
+         :isShowInfo="isShowAdd"
+         @close="closeAdd"
+       >
+       </brand-add-dialog>
   </div>
 </template>
 
@@ -103,21 +102,6 @@
           address3: '0.5',
           address4: '每天必做'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
@@ -125,7 +109,8 @@
           label: '黄金糕'
         }
       ],
-      value: ''
+      value: '',
+      input:''
     }
   },
   methods: {

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 33c1a3d..d833399 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -316,12 +316,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+      </div>
+      <div>
           <el-button class="table-btn" @click="handleAddBtn">
             添加项目需求
           </el-button>
         </div>
-      </div>
     </div>
     <div class="btnBox">
       <el-button type="primary" class="save" @click="save">
@@ -421,22 +421,27 @@
   },
   methods: {
     save() {
-      this.addInfo.productList = {
+      if(this.valiateForm()){
+        this.addInfo.productList = {
         productCode: this.addInfo.productList.productCode,
         productQuantity: this.addInfo.productList.productQuantity,
         productPrice: this.addInfo.productList.productPrice,
         productName: ''
       }
       add(this.addInfo).then(res => {
-        console.log(res)
-        if (res) {
+        this.setData()
           this.$message({
             message: '保存成功',
             type: 'success'
           })
-        }
-      })
-      this.setData()
+      }) 
+      } else {
+        this.$message({
+            message: '请先完整填写报备信息',
+            type: 'error'
+          })
+      }
+      
     },
     close() {
       this.setData()
@@ -462,7 +467,6 @@
         this.form.countyList = res
       })
     },
-
     handleAddBtn() {
       const obj = {}
       obj.brandName = ''
@@ -525,6 +529,12 @@
           this.$set(this.showEdit, index, false) // vue添加属性的方法
         }
       })
+      row.productCode = this.addInfo.productList.productCode
+      row.brandName = this.brandName
+      console.log(this.categoryIds)
+      row.categoryIds = this.categoryIds
+      row.productQuantity = this.addInfo.productList.productQuantity
+      row.productPrice = this.addInfo.productList.productPrice
     },
     setData() {
       this.addInfo = {
@@ -553,6 +563,17 @@
         agentPhone: '',
         productList: []
       }
+    },
+    valiateForm() {
+      let arr = []
+      for(var item in this.addInfo) {
+        if(this.addInfo[item]){
+          arr.push(1)
+        }else{
+          arr.push(0)
+        }
+      }
+      return arr.every(item => item === 1)
     }
   }
 }
@@ -568,7 +589,7 @@
 
   .report-from {
     .from-title {
-      font-size: 22px;
+      font-size: 16px;
       font-weight: bold;
       background-color: #28739e;
       color: white;
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 4f061c8..2964d08 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -68,12 +68,11 @@
       <!-- <div>页码</div> -->
     </div>
     <!-- 新增弹框 -->
-
-    <!--    <brand-add-dialog-->
-    <!--      :isShowInfo="isShowAdd"-->
-    <!--      @close="closeAdd"-->
-    <!--    >-->
-    <!--    </brand-add-dialog>-->
+       <brand-add-dialog
+         :isShowInfo="isShowAdd"
+         @close="closeAdd"
+       >
+       </brand-add-dialog>
   </div>
 </template>
 
@@ -103,21 +102,6 @@
           address3: '0.5',
           address4: '每天必做'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
@@ -125,7 +109,8 @@
           label: '黄金糕'
         }
       ],
-      value: ''
+      value: '',
+      input:''
     }
   },
   methods: {
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 1b06442..af68692 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -129,21 +129,6 @@
           address4: '100元',
           address5: '是'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 33c1a3d..d833399 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -316,12 +316,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+      </div>
+      <div>
           <el-button class="table-btn" @click="handleAddBtn">
             添加项目需求
           </el-button>
         </div>
-      </div>
     </div>
     <div class="btnBox">
       <el-button type="primary" class="save" @click="save">
@@ -421,22 +421,27 @@
   },
   methods: {
     save() {
-      this.addInfo.productList = {
+      if(this.valiateForm()){
+        this.addInfo.productList = {
         productCode: this.addInfo.productList.productCode,
         productQuantity: this.addInfo.productList.productQuantity,
         productPrice: this.addInfo.productList.productPrice,
         productName: ''
       }
       add(this.addInfo).then(res => {
-        console.log(res)
-        if (res) {
+        this.setData()
           this.$message({
             message: '保存成功',
             type: 'success'
           })
-        }
-      })
-      this.setData()
+      }) 
+      } else {
+        this.$message({
+            message: '请先完整填写报备信息',
+            type: 'error'
+          })
+      }
+      
     },
     close() {
       this.setData()
@@ -462,7 +467,6 @@
         this.form.countyList = res
       })
     },
-
     handleAddBtn() {
       const obj = {}
       obj.brandName = ''
@@ -525,6 +529,12 @@
           this.$set(this.showEdit, index, false) // vue添加属性的方法
         }
       })
+      row.productCode = this.addInfo.productList.productCode
+      row.brandName = this.brandName
+      console.log(this.categoryIds)
+      row.categoryIds = this.categoryIds
+      row.productQuantity = this.addInfo.productList.productQuantity
+      row.productPrice = this.addInfo.productList.productPrice
     },
     setData() {
       this.addInfo = {
@@ -553,6 +563,17 @@
         agentPhone: '',
         productList: []
       }
+    },
+    valiateForm() {
+      let arr = []
+      for(var item in this.addInfo) {
+        if(this.addInfo[item]){
+          arr.push(1)
+        }else{
+          arr.push(0)
+        }
+      }
+      return arr.every(item => item === 1)
     }
   }
 }
@@ -568,7 +589,7 @@
 
   .report-from {
     .from-title {
-      font-size: 22px;
+      font-size: 16px;
       font-weight: bold;
       background-color: #28739e;
       color: white;
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 4f061c8..2964d08 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -68,12 +68,11 @@
       <!-- <div>页码</div> -->
     </div>
     <!-- 新增弹框 -->
-
-    <!--    <brand-add-dialog-->
-    <!--      :isShowInfo="isShowAdd"-->
-    <!--      @close="closeAdd"-->
-    <!--    >-->
-    <!--    </brand-add-dialog>-->
+       <brand-add-dialog
+         :isShowInfo="isShowAdd"
+         @close="closeAdd"
+       >
+       </brand-add-dialog>
   </div>
 </template>
 
@@ -103,21 +102,6 @@
           address3: '0.5',
           address4: '每天必做'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
@@ -125,7 +109,8 @@
           label: '黄金糕'
         }
       ],
-      value: ''
+      value: '',
+      input:''
     }
   },
   methods: {
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 1b06442..af68692 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -129,21 +129,6 @@
           address4: '100元',
           address5: '是'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index 1874202..36c7c50 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -2,30 +2,52 @@
 <template>
   <div class="order-container">
     <div class="order-from">
-      <div class="order-title">
-        下订单
-      </div>
+      <div class="order-title">下订单</div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userName" title="下单人" placeholder="请输入下单人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userName"
+            title="下单人"
+            placeholder="请输入下单人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userPhone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userPhone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="签订日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.signDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.signDate"
+              type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
           <inputVue title="交付日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.deliveryDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.deliveryDate"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
@@ -40,7 +62,12 @@
               style="width: 150px; margin-left: 55px"
               @change="provinceChange($event)"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -51,21 +78,47 @@
               style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.deliveryArea" clearable placeholder="县/街道" style="width: 150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-select
+              v-model="addInfo.deliveryArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.deliveryAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.deliveryAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.receiver" title="收货人" placeholder="请输入收货人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.receiver"
+            title="收货人"
+            placeholder="请输入收货人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -81,16 +134,20 @@
       <div class="order-inputBox">
         <div class="input-item">
           <inputVue title="备注" class="inputWidth">
-            <el-input v-model="addInfo.remark" type="textarea" :rows="4" placeholder="请输入备注" style="width: 380px" />
+            <el-input
+              v-model="addInfo.remark"
+              type="textarea"
+              :rows="4"
+              placeholder="请输入备注"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
     </div>
     <div class="order-list">
       <div class="title-box">
-        <div class="list-title">
-          产品列表
-        </div>
+        <div class="list-title">产品列表</div>
       </div>
       <div class="order-table">
         <el-table
@@ -106,7 +163,9 @@
           <el-table-column prop="productPrice" label="产品单价" />
           <el-table-column label="操作">
             <template slot-scope="scope">
-              删除
+              <el-button @click="deleteTableDataClick(scope.$index, scope.row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -116,7 +175,7 @@
             <template slot-scope="scope">
               <el-select v-model="brandName" clearable placeholder="请选择">
                 <el-option
-                  v-for="item in brandList"
+                  v-for="item in list.brandList"
                   :key="item.brandCode"
                   :label="item.brandName"
                   :value="item.brandName"
@@ -128,7 +187,7 @@
             <template slot-scope="scope">
               <el-select v-model="categoryIds" clearable placeholder="请选择" @change="categoryIdChange">
                 <el-option
-                  v-for="item in categoryList"
+                  v-for="item in list.categoryList"
                   :key="item.id"
                   :label="item.categoryName"
                   :value="item.categoryName"
@@ -138,20 +197,26 @@
           </el-table-column>
           <el-table-column prop="productCode" label="产品型号">
             <el-select v-model="productCode" clearable placeholder="请选择">
-              <el-option v-for="item in CodeList" :key="item.id" :label="item.productCode" :value="item.productCode" />
+              <el-option
+                v-for="item in list.codeList"
+                :key="item.id"
+                :label="item.productCode"
+                :value="item.productCode"
+              />
             </el-select>
           </el-table-column>
           <el-table-column prop="productQuantity" label="产品数量">
-            <el-input v-model="addInfo.productList.productQuantity" placeholder="请输入内容" />
+            <el-input
+              v-model="addInfo.productList.productQuantity"
+              placeholder="请输入内容"
+            />
           </el-table-column>
           <el-table-column prop="productPrice" label="产品单价">
             <el-input v-model="productPrice1" placeholder="请输入内容" />
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button @click="addTableDataClick">
-                保存
-              </el-button>
+              <el-button @click="addTableDataClick"> 保存 </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -165,145 +230,223 @@
       </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
       <!-- <el-button type="info" class="close">取消</el-button> -->
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { add, order_area } from '../../api/order/order'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { list } from '../../api/product/product'
+import { add, order_area } from "../../api/order/order";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { list } from "../../api/product/product";
 export default {
+  name:'orderShop',
   components: {
     RedStar,
-    inputVue
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
-      productCode: '',
-      productQuantity1: '',
-      productPrice1: '',
-      CodeList: [],
-      brandList: [],
-      categoryList: [],
-      productList: [{ index: '' }],
+      brandName: "",
+      categoryIds: "",
+      productCode: "",
+      productQuantity1: "",
+      productPrice1: "",
+      list: {
+        codeList: [],
+        brandList: [],
+        categoryList: [],
+      },
+      productList: [{ index: "" }],
       isShowAdd: false, // 添加采购需求
       options: {},
       addInfo: {
-        userName: '', // 下单人
-        userPhone: '', // 联系方式
-        signDate: '', // 签订日期
-        deliveryDate: '', // 交付日期
-        deliveryProvince: '', // 地址-省
-        deliveryCity: '', // 地址-市
-        deliveryArea: '', // 地址-区
-        deliveryAddress: '', // 详细地址
-        receiver: '', // 收货人
-        receiverPhone: '', // 收货人联系方式
-        remark: '', // 备注
-        productList: []
+        userName: "", // 下单人
+        userPhone: "", // 联系方式
+        signDate: "", // 签订日期
+        deliveryDate: "", // 交付日期
+        deliveryProvince: "", // 地址-省
+        deliveryCity: "", // 地址-市
+        deliveryArea: "", // 地址-区
+        deliveryAddress: "", // 详细地址
+        receiver: "", // 收货人
+        receiverPhone: "", // 收货人联系方式
+        remark: "", // 备注
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
+        countyList: [],
       },
       CITY: [],
-      XIAN: []
-    }
+      XIAN: [],
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
         if (!this.addInfo.deliveryProvince) {
-          this.addInfo.deliveryCity = ''
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryCity = "";
+          this.addInfo.deliveryArea = "";
         } else if (!this.addInfo.deliveryCity) {
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
-    C_list().then(res => {
-      this.categoryList = res.data
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
+    C_list().then((res) => {
+      // 获取产品品类列表
+      this.list.categoryList = res.data;
     }),
-    SelectList().then(res => {
-      this.brandList = res
-    })
+      SelectList().then((res) => {
+        // 获取产品品牌列表
+        this.list.brandList = res;
+      });
   },
   methods: {
     save() {
-      add(this.addInfo).then((res) => {
-        console.log(res)
-      })
-      this.addInfo = {}
+      if (this.valiateProduct()) {
+        if (this.valiateForm()) {
+          add(this.addInfo).then((res) => {
+            // 添加成功
+            this.$message({
+              message: "保存成功",
+              type: "success",
+            });
+            this.addInfo = {
+              userName: "", // 下单人
+              userPhone: "", // 联系方式
+              signDate: "", // 签订日期
+              deliveryDate: "", // 交付日期
+              deliveryProvince: "", // 地址-省
+              deliveryCity: "", // 地址-市
+              deliveryArea: "", // 地址-区
+              deliveryAddress: "", // 详细地址
+              receiver: "", // 收货人
+              receiverPhone: "", // 收货人联系方式
+              remark: "", // 备注
+              productList: [],
+            };
+          });
+        }
+      }
     },
     provinceChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     showAddDialogClick() {
-      this.isShowAdd = true
+      this.isShowAdd = true;
     },
     close() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addTableDataClick() {
-      const obj = {}
-      obj.brandName = this.brandName
-      obj.categoryIds = this.categoryIds
-      obj.productCode = this.productCode
-      obj.productQuantity = this.addInfo.productList.productQuantity
-      obj.productPrice = this.productPrice1
-      this.addInfo.productList.push(obj)
-      this.brandName = '',
-      this.categoryIds = '',
-      this.productCode = '',
-      this.productQuantity1 = '',
-      this.productPrice1 = ''
+      const obj = {};
+      obj.brandName = this.brandName;
+      obj.categoryIds = this.categoryIds;
+      obj.productCode = this.productCode;
+      obj.productQuantity = this.productQuantity1;
+      obj.productPrice = this.productPrice1;
+      this.addInfo.productList.push(obj);
+      (this.brandName = ""),
+        (this.categoryIds = ""),
+        (this.productCode = ""),
+        (this.productQuantity1 = ""),
+        (this.productPrice1 = "");
+    },
+    deleteTableDataClick(tabIndex, row) {
+      this.addInfo.productList = this.addInfo.productList.filter(
+        (product, index) => {
+          return index !== tabIndex;
+        }
+      );
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
-    }
-  }
-}
+      const index = this.list.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      console.log(index);
+      const code = this.list.categoryList[index].id;
+      console.log(code);
+      // 获取产品型号列表
+      list({ categoryId: code }).then((res) => {
+        this.list.CodeList = res;
+      });
+    },
+    valiateProduct() {
+      // 验证产品列表
+      if (this.addInfo.productList.length) {
+        return true;
+      } else {
+        this.$message({
+          message: "产品列表不能为空",
+          type: "error",
+        });
+        return false;
+      }
+    },
+    valiateForm() {
+      const {
+        addInfo: {
+          userName,
+          userPhone,
+          signDate,
+          deliveryDate,
+          deliveryProvince,
+          deliveryCity,
+          deliveryArea,
+          deliveryAddress,
+          receiver,
+          receiverPhone,
+        },
+      } = this;
+      if (
+        userName &&
+        userPhone &&
+        signDate &&
+        deliveryDate &&
+        deliveryProvince &&
+        deliveryCity &&
+        deliveryArea &&
+        deliveryAddress &&
+        receiver &&
+        receiverPhone
+      ) {
+        return true;
+      } else {
+        this.$message({
+          message: "请先填写完整订单信息",
+          type: "error",
+        });
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 33c1a3d..d833399 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -316,12 +316,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+      </div>
+      <div>
           <el-button class="table-btn" @click="handleAddBtn">
             添加项目需求
           </el-button>
         </div>
-      </div>
     </div>
     <div class="btnBox">
       <el-button type="primary" class="save" @click="save">
@@ -421,22 +421,27 @@
   },
   methods: {
     save() {
-      this.addInfo.productList = {
+      if(this.valiateForm()){
+        this.addInfo.productList = {
         productCode: this.addInfo.productList.productCode,
         productQuantity: this.addInfo.productList.productQuantity,
         productPrice: this.addInfo.productList.productPrice,
         productName: ''
       }
       add(this.addInfo).then(res => {
-        console.log(res)
-        if (res) {
+        this.setData()
           this.$message({
             message: '保存成功',
             type: 'success'
           })
-        }
-      })
-      this.setData()
+      }) 
+      } else {
+        this.$message({
+            message: '请先完整填写报备信息',
+            type: 'error'
+          })
+      }
+      
     },
     close() {
       this.setData()
@@ -462,7 +467,6 @@
         this.form.countyList = res
       })
     },
-
     handleAddBtn() {
       const obj = {}
       obj.brandName = ''
@@ -525,6 +529,12 @@
           this.$set(this.showEdit, index, false) // vue添加属性的方法
         }
       })
+      row.productCode = this.addInfo.productList.productCode
+      row.brandName = this.brandName
+      console.log(this.categoryIds)
+      row.categoryIds = this.categoryIds
+      row.productQuantity = this.addInfo.productList.productQuantity
+      row.productPrice = this.addInfo.productList.productPrice
     },
     setData() {
       this.addInfo = {
@@ -553,6 +563,17 @@
         agentPhone: '',
         productList: []
       }
+    },
+    valiateForm() {
+      let arr = []
+      for(var item in this.addInfo) {
+        if(this.addInfo[item]){
+          arr.push(1)
+        }else{
+          arr.push(0)
+        }
+      }
+      return arr.every(item => item === 1)
     }
   }
 }
@@ -568,7 +589,7 @@
 
   .report-from {
     .from-title {
-      font-size: 22px;
+      font-size: 16px;
       font-weight: bold;
       background-color: #28739e;
       color: white;
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 4f061c8..2964d08 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -68,12 +68,11 @@
       <!-- <div>页码</div> -->
     </div>
     <!-- 新增弹框 -->
-
-    <!--    <brand-add-dialog-->
-    <!--      :isShowInfo="isShowAdd"-->
-    <!--      @close="closeAdd"-->
-    <!--    >-->
-    <!--    </brand-add-dialog>-->
+       <brand-add-dialog
+         :isShowInfo="isShowAdd"
+         @close="closeAdd"
+       >
+       </brand-add-dialog>
   </div>
 </template>
 
@@ -103,21 +102,6 @@
           address3: '0.5',
           address4: '每天必做'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
@@ -125,7 +109,8 @@
           label: '黄金糕'
         }
       ],
-      value: ''
+      value: '',
+      input:''
     }
   },
   methods: {
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 1b06442..af68692 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -129,21 +129,6 @@
           address4: '100元',
           address5: '是'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index 1874202..36c7c50 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -2,30 +2,52 @@
 <template>
   <div class="order-container">
     <div class="order-from">
-      <div class="order-title">
-        下订单
-      </div>
+      <div class="order-title">下订单</div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userName" title="下单人" placeholder="请输入下单人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userName"
+            title="下单人"
+            placeholder="请输入下单人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userPhone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userPhone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="签订日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.signDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.signDate"
+              type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
           <inputVue title="交付日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.deliveryDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.deliveryDate"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
@@ -40,7 +62,12 @@
               style="width: 150px; margin-left: 55px"
               @change="provinceChange($event)"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -51,21 +78,47 @@
               style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.deliveryArea" clearable placeholder="县/街道" style="width: 150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-select
+              v-model="addInfo.deliveryArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.deliveryAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.deliveryAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.receiver" title="收货人" placeholder="请输入收货人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.receiver"
+            title="收货人"
+            placeholder="请输入收货人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -81,16 +134,20 @@
       <div class="order-inputBox">
         <div class="input-item">
           <inputVue title="备注" class="inputWidth">
-            <el-input v-model="addInfo.remark" type="textarea" :rows="4" placeholder="请输入备注" style="width: 380px" />
+            <el-input
+              v-model="addInfo.remark"
+              type="textarea"
+              :rows="4"
+              placeholder="请输入备注"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
     </div>
     <div class="order-list">
       <div class="title-box">
-        <div class="list-title">
-          产品列表
-        </div>
+        <div class="list-title">产品列表</div>
       </div>
       <div class="order-table">
         <el-table
@@ -106,7 +163,9 @@
           <el-table-column prop="productPrice" label="产品单价" />
           <el-table-column label="操作">
             <template slot-scope="scope">
-              删除
+              <el-button @click="deleteTableDataClick(scope.$index, scope.row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -116,7 +175,7 @@
             <template slot-scope="scope">
               <el-select v-model="brandName" clearable placeholder="请选择">
                 <el-option
-                  v-for="item in brandList"
+                  v-for="item in list.brandList"
                   :key="item.brandCode"
                   :label="item.brandName"
                   :value="item.brandName"
@@ -128,7 +187,7 @@
             <template slot-scope="scope">
               <el-select v-model="categoryIds" clearable placeholder="请选择" @change="categoryIdChange">
                 <el-option
-                  v-for="item in categoryList"
+                  v-for="item in list.categoryList"
                   :key="item.id"
                   :label="item.categoryName"
                   :value="item.categoryName"
@@ -138,20 +197,26 @@
           </el-table-column>
           <el-table-column prop="productCode" label="产品型号">
             <el-select v-model="productCode" clearable placeholder="请选择">
-              <el-option v-for="item in CodeList" :key="item.id" :label="item.productCode" :value="item.productCode" />
+              <el-option
+                v-for="item in list.codeList"
+                :key="item.id"
+                :label="item.productCode"
+                :value="item.productCode"
+              />
             </el-select>
           </el-table-column>
           <el-table-column prop="productQuantity" label="产品数量">
-            <el-input v-model="addInfo.productList.productQuantity" placeholder="请输入内容" />
+            <el-input
+              v-model="addInfo.productList.productQuantity"
+              placeholder="请输入内容"
+            />
           </el-table-column>
           <el-table-column prop="productPrice" label="产品单价">
             <el-input v-model="productPrice1" placeholder="请输入内容" />
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button @click="addTableDataClick">
-                保存
-              </el-button>
+              <el-button @click="addTableDataClick"> 保存 </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -165,145 +230,223 @@
       </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
       <!-- <el-button type="info" class="close">取消</el-button> -->
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { add, order_area } from '../../api/order/order'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { list } from '../../api/product/product'
+import { add, order_area } from "../../api/order/order";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { list } from "../../api/product/product";
 export default {
+  name:'orderShop',
   components: {
     RedStar,
-    inputVue
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
-      productCode: '',
-      productQuantity1: '',
-      productPrice1: '',
-      CodeList: [],
-      brandList: [],
-      categoryList: [],
-      productList: [{ index: '' }],
+      brandName: "",
+      categoryIds: "",
+      productCode: "",
+      productQuantity1: "",
+      productPrice1: "",
+      list: {
+        codeList: [],
+        brandList: [],
+        categoryList: [],
+      },
+      productList: [{ index: "" }],
       isShowAdd: false, // 添加采购需求
       options: {},
       addInfo: {
-        userName: '', // 下单人
-        userPhone: '', // 联系方式
-        signDate: '', // 签订日期
-        deliveryDate: '', // 交付日期
-        deliveryProvince: '', // 地址-省
-        deliveryCity: '', // 地址-市
-        deliveryArea: '', // 地址-区
-        deliveryAddress: '', // 详细地址
-        receiver: '', // 收货人
-        receiverPhone: '', // 收货人联系方式
-        remark: '', // 备注
-        productList: []
+        userName: "", // 下单人
+        userPhone: "", // 联系方式
+        signDate: "", // 签订日期
+        deliveryDate: "", // 交付日期
+        deliveryProvince: "", // 地址-省
+        deliveryCity: "", // 地址-市
+        deliveryArea: "", // 地址-区
+        deliveryAddress: "", // 详细地址
+        receiver: "", // 收货人
+        receiverPhone: "", // 收货人联系方式
+        remark: "", // 备注
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
+        countyList: [],
       },
       CITY: [],
-      XIAN: []
-    }
+      XIAN: [],
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
         if (!this.addInfo.deliveryProvince) {
-          this.addInfo.deliveryCity = ''
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryCity = "";
+          this.addInfo.deliveryArea = "";
         } else if (!this.addInfo.deliveryCity) {
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
-    C_list().then(res => {
-      this.categoryList = res.data
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
+    C_list().then((res) => {
+      // 获取产品品类列表
+      this.list.categoryList = res.data;
     }),
-    SelectList().then(res => {
-      this.brandList = res
-    })
+      SelectList().then((res) => {
+        // 获取产品品牌列表
+        this.list.brandList = res;
+      });
   },
   methods: {
     save() {
-      add(this.addInfo).then((res) => {
-        console.log(res)
-      })
-      this.addInfo = {}
+      if (this.valiateProduct()) {
+        if (this.valiateForm()) {
+          add(this.addInfo).then((res) => {
+            // 添加成功
+            this.$message({
+              message: "保存成功",
+              type: "success",
+            });
+            this.addInfo = {
+              userName: "", // 下单人
+              userPhone: "", // 联系方式
+              signDate: "", // 签订日期
+              deliveryDate: "", // 交付日期
+              deliveryProvince: "", // 地址-省
+              deliveryCity: "", // 地址-市
+              deliveryArea: "", // 地址-区
+              deliveryAddress: "", // 详细地址
+              receiver: "", // 收货人
+              receiverPhone: "", // 收货人联系方式
+              remark: "", // 备注
+              productList: [],
+            };
+          });
+        }
+      }
     },
     provinceChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     showAddDialogClick() {
-      this.isShowAdd = true
+      this.isShowAdd = true;
     },
     close() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addTableDataClick() {
-      const obj = {}
-      obj.brandName = this.brandName
-      obj.categoryIds = this.categoryIds
-      obj.productCode = this.productCode
-      obj.productQuantity = this.addInfo.productList.productQuantity
-      obj.productPrice = this.productPrice1
-      this.addInfo.productList.push(obj)
-      this.brandName = '',
-      this.categoryIds = '',
-      this.productCode = '',
-      this.productQuantity1 = '',
-      this.productPrice1 = ''
+      const obj = {};
+      obj.brandName = this.brandName;
+      obj.categoryIds = this.categoryIds;
+      obj.productCode = this.productCode;
+      obj.productQuantity = this.productQuantity1;
+      obj.productPrice = this.productPrice1;
+      this.addInfo.productList.push(obj);
+      (this.brandName = ""),
+        (this.categoryIds = ""),
+        (this.productCode = ""),
+        (this.productQuantity1 = ""),
+        (this.productPrice1 = "");
+    },
+    deleteTableDataClick(tabIndex, row) {
+      this.addInfo.productList = this.addInfo.productList.filter(
+        (product, index) => {
+          return index !== tabIndex;
+        }
+      );
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
-    }
-  }
-}
+      const index = this.list.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      console.log(index);
+      const code = this.list.categoryList[index].id;
+      console.log(code);
+      // 获取产品型号列表
+      list({ categoryId: code }).then((res) => {
+        this.list.CodeList = res;
+      });
+    },
+    valiateProduct() {
+      // 验证产品列表
+      if (this.addInfo.productList.length) {
+        return true;
+      } else {
+        this.$message({
+          message: "产品列表不能为空",
+          type: "error",
+        });
+        return false;
+      }
+    },
+    valiateForm() {
+      const {
+        addInfo: {
+          userName,
+          userPhone,
+          signDate,
+          deliveryDate,
+          deliveryProvince,
+          deliveryCity,
+          deliveryArea,
+          deliveryAddress,
+          receiver,
+          receiverPhone,
+        },
+      } = this;
+      if (
+        userName &&
+        userPhone &&
+        signDate &&
+        deliveryDate &&
+        deliveryProvince &&
+        deliveryCity &&
+        deliveryArea &&
+        deliveryAddress &&
+        receiver &&
+        receiverPhone
+      ) {
+        return true;
+      } else {
+        this.$message({
+          message: "请先填写完整订单信息",
+          type: "error",
+        });
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, '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
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 33c1a3d..d833399 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -316,12 +316,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+      </div>
+      <div>
           <el-button class="table-btn" @click="handleAddBtn">
             添加项目需求
           </el-button>
         </div>
-      </div>
     </div>
     <div class="btnBox">
       <el-button type="primary" class="save" @click="save">
@@ -421,22 +421,27 @@
   },
   methods: {
     save() {
-      this.addInfo.productList = {
+      if(this.valiateForm()){
+        this.addInfo.productList = {
         productCode: this.addInfo.productList.productCode,
         productQuantity: this.addInfo.productList.productQuantity,
         productPrice: this.addInfo.productList.productPrice,
         productName: ''
       }
       add(this.addInfo).then(res => {
-        console.log(res)
-        if (res) {
+        this.setData()
           this.$message({
             message: '保存成功',
             type: 'success'
           })
-        }
-      })
-      this.setData()
+      }) 
+      } else {
+        this.$message({
+            message: '请先完整填写报备信息',
+            type: 'error'
+          })
+      }
+      
     },
     close() {
       this.setData()
@@ -462,7 +467,6 @@
         this.form.countyList = res
       })
     },
-
     handleAddBtn() {
       const obj = {}
       obj.brandName = ''
@@ -525,6 +529,12 @@
           this.$set(this.showEdit, index, false) // vue添加属性的方法
         }
       })
+      row.productCode = this.addInfo.productList.productCode
+      row.brandName = this.brandName
+      console.log(this.categoryIds)
+      row.categoryIds = this.categoryIds
+      row.productQuantity = this.addInfo.productList.productQuantity
+      row.productPrice = this.addInfo.productList.productPrice
     },
     setData() {
       this.addInfo = {
@@ -553,6 +563,17 @@
         agentPhone: '',
         productList: []
       }
+    },
+    valiateForm() {
+      let arr = []
+      for(var item in this.addInfo) {
+        if(this.addInfo[item]){
+          arr.push(1)
+        }else{
+          arr.push(0)
+        }
+      }
+      return arr.every(item => item === 1)
     }
   }
 }
@@ -568,7 +589,7 @@
 
   .report-from {
     .from-title {
-      font-size: 22px;
+      font-size: 16px;
       font-weight: bold;
       background-color: #28739e;
       color: white;
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 4f061c8..2964d08 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -68,12 +68,11 @@
       <!-- <div>页码</div> -->
     </div>
     <!-- 新增弹框 -->
-
-    <!--    <brand-add-dialog-->
-    <!--      :isShowInfo="isShowAdd"-->
-    <!--      @close="closeAdd"-->
-    <!--    >-->
-    <!--    </brand-add-dialog>-->
+       <brand-add-dialog
+         :isShowInfo="isShowAdd"
+         @close="closeAdd"
+       >
+       </brand-add-dialog>
   </div>
 </template>
 
@@ -103,21 +102,6 @@
           address3: '0.5',
           address4: '每天必做'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
@@ -125,7 +109,8 @@
           label: '黄金糕'
         }
       ],
-      value: ''
+      value: '',
+      input:''
     }
   },
   methods: {
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 1b06442..af68692 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -129,21 +129,6 @@
           address4: '100元',
           address5: '是'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index 1874202..36c7c50 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -2,30 +2,52 @@
 <template>
   <div class="order-container">
     <div class="order-from">
-      <div class="order-title">
-        下订单
-      </div>
+      <div class="order-title">下订单</div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userName" title="下单人" placeholder="请输入下单人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userName"
+            title="下单人"
+            placeholder="请输入下单人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userPhone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userPhone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="签订日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.signDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.signDate"
+              type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
           <inputVue title="交付日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.deliveryDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.deliveryDate"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
@@ -40,7 +62,12 @@
               style="width: 150px; margin-left: 55px"
               @change="provinceChange($event)"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -51,21 +78,47 @@
               style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.deliveryArea" clearable placeholder="县/街道" style="width: 150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-select
+              v-model="addInfo.deliveryArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.deliveryAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.deliveryAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.receiver" title="收货人" placeholder="请输入收货人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.receiver"
+            title="收货人"
+            placeholder="请输入收货人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -81,16 +134,20 @@
       <div class="order-inputBox">
         <div class="input-item">
           <inputVue title="备注" class="inputWidth">
-            <el-input v-model="addInfo.remark" type="textarea" :rows="4" placeholder="请输入备注" style="width: 380px" />
+            <el-input
+              v-model="addInfo.remark"
+              type="textarea"
+              :rows="4"
+              placeholder="请输入备注"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
     </div>
     <div class="order-list">
       <div class="title-box">
-        <div class="list-title">
-          产品列表
-        </div>
+        <div class="list-title">产品列表</div>
       </div>
       <div class="order-table">
         <el-table
@@ -106,7 +163,9 @@
           <el-table-column prop="productPrice" label="产品单价" />
           <el-table-column label="操作">
             <template slot-scope="scope">
-              删除
+              <el-button @click="deleteTableDataClick(scope.$index, scope.row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -116,7 +175,7 @@
             <template slot-scope="scope">
               <el-select v-model="brandName" clearable placeholder="请选择">
                 <el-option
-                  v-for="item in brandList"
+                  v-for="item in list.brandList"
                   :key="item.brandCode"
                   :label="item.brandName"
                   :value="item.brandName"
@@ -128,7 +187,7 @@
             <template slot-scope="scope">
               <el-select v-model="categoryIds" clearable placeholder="请选择" @change="categoryIdChange">
                 <el-option
-                  v-for="item in categoryList"
+                  v-for="item in list.categoryList"
                   :key="item.id"
                   :label="item.categoryName"
                   :value="item.categoryName"
@@ -138,20 +197,26 @@
           </el-table-column>
           <el-table-column prop="productCode" label="产品型号">
             <el-select v-model="productCode" clearable placeholder="请选择">
-              <el-option v-for="item in CodeList" :key="item.id" :label="item.productCode" :value="item.productCode" />
+              <el-option
+                v-for="item in list.codeList"
+                :key="item.id"
+                :label="item.productCode"
+                :value="item.productCode"
+              />
             </el-select>
           </el-table-column>
           <el-table-column prop="productQuantity" label="产品数量">
-            <el-input v-model="addInfo.productList.productQuantity" placeholder="请输入内容" />
+            <el-input
+              v-model="addInfo.productList.productQuantity"
+              placeholder="请输入内容"
+            />
           </el-table-column>
           <el-table-column prop="productPrice" label="产品单价">
             <el-input v-model="productPrice1" placeholder="请输入内容" />
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button @click="addTableDataClick">
-                保存
-              </el-button>
+              <el-button @click="addTableDataClick"> 保存 </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -165,145 +230,223 @@
       </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
       <!-- <el-button type="info" class="close">取消</el-button> -->
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { add, order_area } from '../../api/order/order'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { list } from '../../api/product/product'
+import { add, order_area } from "../../api/order/order";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { list } from "../../api/product/product";
 export default {
+  name:'orderShop',
   components: {
     RedStar,
-    inputVue
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
-      productCode: '',
-      productQuantity1: '',
-      productPrice1: '',
-      CodeList: [],
-      brandList: [],
-      categoryList: [],
-      productList: [{ index: '' }],
+      brandName: "",
+      categoryIds: "",
+      productCode: "",
+      productQuantity1: "",
+      productPrice1: "",
+      list: {
+        codeList: [],
+        brandList: [],
+        categoryList: [],
+      },
+      productList: [{ index: "" }],
       isShowAdd: false, // 添加采购需求
       options: {},
       addInfo: {
-        userName: '', // 下单人
-        userPhone: '', // 联系方式
-        signDate: '', // 签订日期
-        deliveryDate: '', // 交付日期
-        deliveryProvince: '', // 地址-省
-        deliveryCity: '', // 地址-市
-        deliveryArea: '', // 地址-区
-        deliveryAddress: '', // 详细地址
-        receiver: '', // 收货人
-        receiverPhone: '', // 收货人联系方式
-        remark: '', // 备注
-        productList: []
+        userName: "", // 下单人
+        userPhone: "", // 联系方式
+        signDate: "", // 签订日期
+        deliveryDate: "", // 交付日期
+        deliveryProvince: "", // 地址-省
+        deliveryCity: "", // 地址-市
+        deliveryArea: "", // 地址-区
+        deliveryAddress: "", // 详细地址
+        receiver: "", // 收货人
+        receiverPhone: "", // 收货人联系方式
+        remark: "", // 备注
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
+        countyList: [],
       },
       CITY: [],
-      XIAN: []
-    }
+      XIAN: [],
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
         if (!this.addInfo.deliveryProvince) {
-          this.addInfo.deliveryCity = ''
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryCity = "";
+          this.addInfo.deliveryArea = "";
         } else if (!this.addInfo.deliveryCity) {
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
-    C_list().then(res => {
-      this.categoryList = res.data
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
+    C_list().then((res) => {
+      // 获取产品品类列表
+      this.list.categoryList = res.data;
     }),
-    SelectList().then(res => {
-      this.brandList = res
-    })
+      SelectList().then((res) => {
+        // 获取产品品牌列表
+        this.list.brandList = res;
+      });
   },
   methods: {
     save() {
-      add(this.addInfo).then((res) => {
-        console.log(res)
-      })
-      this.addInfo = {}
+      if (this.valiateProduct()) {
+        if (this.valiateForm()) {
+          add(this.addInfo).then((res) => {
+            // 添加成功
+            this.$message({
+              message: "保存成功",
+              type: "success",
+            });
+            this.addInfo = {
+              userName: "", // 下单人
+              userPhone: "", // 联系方式
+              signDate: "", // 签订日期
+              deliveryDate: "", // 交付日期
+              deliveryProvince: "", // 地址-省
+              deliveryCity: "", // 地址-市
+              deliveryArea: "", // 地址-区
+              deliveryAddress: "", // 详细地址
+              receiver: "", // 收货人
+              receiverPhone: "", // 收货人联系方式
+              remark: "", // 备注
+              productList: [],
+            };
+          });
+        }
+      }
     },
     provinceChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     showAddDialogClick() {
-      this.isShowAdd = true
+      this.isShowAdd = true;
     },
     close() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addTableDataClick() {
-      const obj = {}
-      obj.brandName = this.brandName
-      obj.categoryIds = this.categoryIds
-      obj.productCode = this.productCode
-      obj.productQuantity = this.addInfo.productList.productQuantity
-      obj.productPrice = this.productPrice1
-      this.addInfo.productList.push(obj)
-      this.brandName = '',
-      this.categoryIds = '',
-      this.productCode = '',
-      this.productQuantity1 = '',
-      this.productPrice1 = ''
+      const obj = {};
+      obj.brandName = this.brandName;
+      obj.categoryIds = this.categoryIds;
+      obj.productCode = this.productCode;
+      obj.productQuantity = this.productQuantity1;
+      obj.productPrice = this.productPrice1;
+      this.addInfo.productList.push(obj);
+      (this.brandName = ""),
+        (this.categoryIds = ""),
+        (this.productCode = ""),
+        (this.productQuantity1 = ""),
+        (this.productPrice1 = "");
+    },
+    deleteTableDataClick(tabIndex, row) {
+      this.addInfo.productList = this.addInfo.productList.filter(
+        (product, index) => {
+          return index !== tabIndex;
+        }
+      );
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
-    }
-  }
-}
+      const index = this.list.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      console.log(index);
+      const code = this.list.categoryList[index].id;
+      console.log(code);
+      // 获取产品型号列表
+      list({ categoryId: code }).then((res) => {
+        this.list.CodeList = res;
+      });
+    },
+    valiateProduct() {
+      // 验证产品列表
+      if (this.addInfo.productList.length) {
+        return true;
+      } else {
+        this.$message({
+          message: "产品列表不能为空",
+          type: "error",
+        });
+        return false;
+      }
+    },
+    valiateForm() {
+      const {
+        addInfo: {
+          userName,
+          userPhone,
+          signDate,
+          deliveryDate,
+          deliveryProvince,
+          deliveryCity,
+          deliveryArea,
+          deliveryAddress,
+          receiver,
+          receiverPhone,
+        },
+      } = this;
+      if (
+        userName &&
+        userPhone &&
+        signDate &&
+        deliveryDate &&
+        deliveryProvince &&
+        deliveryCity &&
+        deliveryArea &&
+        deliveryAddress &&
+        receiver &&
+        receiverPhone
+      ) {
+        return true;
+      } else {
+        this.$message({
+          message: "请先填写完整订单信息",
+          type: "error",
+        });
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, '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
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 7930e4c..80a22b2 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="序号" />-->
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -156,10 +156,12 @@
 import {
   C_listPage,
   C_batchDelete,
-  C_delete
+  C_delete, C_listExport
 } from '../../api/product/category'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listExport } from '@/api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default { // 加入分页逻辑
   components: {
@@ -199,6 +201,8 @@
         categoryCode: '',
         categoryName: ''
       }
+      this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 获取指定页面
     getListPage(limit, offset) {
@@ -271,8 +275,19 @@
       this.$refs.addDialog.initDialog('update', row)
     },
     exportToExcel() {
-      C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.data.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      C_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '品类列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 33c1a3d..d833399 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -316,12 +316,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+      </div>
+      <div>
           <el-button class="table-btn" @click="handleAddBtn">
             添加项目需求
           </el-button>
         </div>
-      </div>
     </div>
     <div class="btnBox">
       <el-button type="primary" class="save" @click="save">
@@ -421,22 +421,27 @@
   },
   methods: {
     save() {
-      this.addInfo.productList = {
+      if(this.valiateForm()){
+        this.addInfo.productList = {
         productCode: this.addInfo.productList.productCode,
         productQuantity: this.addInfo.productList.productQuantity,
         productPrice: this.addInfo.productList.productPrice,
         productName: ''
       }
       add(this.addInfo).then(res => {
-        console.log(res)
-        if (res) {
+        this.setData()
           this.$message({
             message: '保存成功',
             type: 'success'
           })
-        }
-      })
-      this.setData()
+      }) 
+      } else {
+        this.$message({
+            message: '请先完整填写报备信息',
+            type: 'error'
+          })
+      }
+      
     },
     close() {
       this.setData()
@@ -462,7 +467,6 @@
         this.form.countyList = res
       })
     },
-
     handleAddBtn() {
       const obj = {}
       obj.brandName = ''
@@ -525,6 +529,12 @@
           this.$set(this.showEdit, index, false) // vue添加属性的方法
         }
       })
+      row.productCode = this.addInfo.productList.productCode
+      row.brandName = this.brandName
+      console.log(this.categoryIds)
+      row.categoryIds = this.categoryIds
+      row.productQuantity = this.addInfo.productList.productQuantity
+      row.productPrice = this.addInfo.productList.productPrice
     },
     setData() {
       this.addInfo = {
@@ -553,6 +563,17 @@
         agentPhone: '',
         productList: []
       }
+    },
+    valiateForm() {
+      let arr = []
+      for(var item in this.addInfo) {
+        if(this.addInfo[item]){
+          arr.push(1)
+        }else{
+          arr.push(0)
+        }
+      }
+      return arr.every(item => item === 1)
     }
   }
 }
@@ -568,7 +589,7 @@
 
   .report-from {
     .from-title {
-      font-size: 22px;
+      font-size: 16px;
       font-weight: bold;
       background-color: #28739e;
       color: white;
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 4f061c8..2964d08 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -68,12 +68,11 @@
       <!-- <div>页码</div> -->
     </div>
     <!-- 新增弹框 -->
-
-    <!--    <brand-add-dialog-->
-    <!--      :isShowInfo="isShowAdd"-->
-    <!--      @close="closeAdd"-->
-    <!--    >-->
-    <!--    </brand-add-dialog>-->
+       <brand-add-dialog
+         :isShowInfo="isShowAdd"
+         @close="closeAdd"
+       >
+       </brand-add-dialog>
   </div>
 </template>
 
@@ -103,21 +102,6 @@
           address3: '0.5',
           address4: '每天必做'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
@@ -125,7 +109,8 @@
           label: '黄金糕'
         }
       ],
-      value: ''
+      value: '',
+      input:''
     }
   },
   methods: {
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 1b06442..af68692 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -129,21 +129,6 @@
           address4: '100元',
           address5: '是'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index 1874202..36c7c50 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -2,30 +2,52 @@
 <template>
   <div class="order-container">
     <div class="order-from">
-      <div class="order-title">
-        下订单
-      </div>
+      <div class="order-title">下订单</div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userName" title="下单人" placeholder="请输入下单人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userName"
+            title="下单人"
+            placeholder="请输入下单人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userPhone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userPhone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="签订日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.signDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.signDate"
+              type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
           <inputVue title="交付日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.deliveryDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.deliveryDate"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
@@ -40,7 +62,12 @@
               style="width: 150px; margin-left: 55px"
               @change="provinceChange($event)"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -51,21 +78,47 @@
               style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.deliveryArea" clearable placeholder="县/街道" style="width: 150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-select
+              v-model="addInfo.deliveryArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.deliveryAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.deliveryAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.receiver" title="收货人" placeholder="请输入收货人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.receiver"
+            title="收货人"
+            placeholder="请输入收货人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -81,16 +134,20 @@
       <div class="order-inputBox">
         <div class="input-item">
           <inputVue title="备注" class="inputWidth">
-            <el-input v-model="addInfo.remark" type="textarea" :rows="4" placeholder="请输入备注" style="width: 380px" />
+            <el-input
+              v-model="addInfo.remark"
+              type="textarea"
+              :rows="4"
+              placeholder="请输入备注"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
     </div>
     <div class="order-list">
       <div class="title-box">
-        <div class="list-title">
-          产品列表
-        </div>
+        <div class="list-title">产品列表</div>
       </div>
       <div class="order-table">
         <el-table
@@ -106,7 +163,9 @@
           <el-table-column prop="productPrice" label="产品单价" />
           <el-table-column label="操作">
             <template slot-scope="scope">
-              删除
+              <el-button @click="deleteTableDataClick(scope.$index, scope.row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -116,7 +175,7 @@
             <template slot-scope="scope">
               <el-select v-model="brandName" clearable placeholder="请选择">
                 <el-option
-                  v-for="item in brandList"
+                  v-for="item in list.brandList"
                   :key="item.brandCode"
                   :label="item.brandName"
                   :value="item.brandName"
@@ -128,7 +187,7 @@
             <template slot-scope="scope">
               <el-select v-model="categoryIds" clearable placeholder="请选择" @change="categoryIdChange">
                 <el-option
-                  v-for="item in categoryList"
+                  v-for="item in list.categoryList"
                   :key="item.id"
                   :label="item.categoryName"
                   :value="item.categoryName"
@@ -138,20 +197,26 @@
           </el-table-column>
           <el-table-column prop="productCode" label="产品型号">
             <el-select v-model="productCode" clearable placeholder="请选择">
-              <el-option v-for="item in CodeList" :key="item.id" :label="item.productCode" :value="item.productCode" />
+              <el-option
+                v-for="item in list.codeList"
+                :key="item.id"
+                :label="item.productCode"
+                :value="item.productCode"
+              />
             </el-select>
           </el-table-column>
           <el-table-column prop="productQuantity" label="产品数量">
-            <el-input v-model="addInfo.productList.productQuantity" placeholder="请输入内容" />
+            <el-input
+              v-model="addInfo.productList.productQuantity"
+              placeholder="请输入内容"
+            />
           </el-table-column>
           <el-table-column prop="productPrice" label="产品单价">
             <el-input v-model="productPrice1" placeholder="请输入内容" />
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button @click="addTableDataClick">
-                保存
-              </el-button>
+              <el-button @click="addTableDataClick"> 保存 </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -165,145 +230,223 @@
       </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
       <!-- <el-button type="info" class="close">取消</el-button> -->
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { add, order_area } from '../../api/order/order'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { list } from '../../api/product/product'
+import { add, order_area } from "../../api/order/order";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { list } from "../../api/product/product";
 export default {
+  name:'orderShop',
   components: {
     RedStar,
-    inputVue
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
-      productCode: '',
-      productQuantity1: '',
-      productPrice1: '',
-      CodeList: [],
-      brandList: [],
-      categoryList: [],
-      productList: [{ index: '' }],
+      brandName: "",
+      categoryIds: "",
+      productCode: "",
+      productQuantity1: "",
+      productPrice1: "",
+      list: {
+        codeList: [],
+        brandList: [],
+        categoryList: [],
+      },
+      productList: [{ index: "" }],
       isShowAdd: false, // 添加采购需求
       options: {},
       addInfo: {
-        userName: '', // 下单人
-        userPhone: '', // 联系方式
-        signDate: '', // 签订日期
-        deliveryDate: '', // 交付日期
-        deliveryProvince: '', // 地址-省
-        deliveryCity: '', // 地址-市
-        deliveryArea: '', // 地址-区
-        deliveryAddress: '', // 详细地址
-        receiver: '', // 收货人
-        receiverPhone: '', // 收货人联系方式
-        remark: '', // 备注
-        productList: []
+        userName: "", // 下单人
+        userPhone: "", // 联系方式
+        signDate: "", // 签订日期
+        deliveryDate: "", // 交付日期
+        deliveryProvince: "", // 地址-省
+        deliveryCity: "", // 地址-市
+        deliveryArea: "", // 地址-区
+        deliveryAddress: "", // 详细地址
+        receiver: "", // 收货人
+        receiverPhone: "", // 收货人联系方式
+        remark: "", // 备注
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
+        countyList: [],
       },
       CITY: [],
-      XIAN: []
-    }
+      XIAN: [],
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
         if (!this.addInfo.deliveryProvince) {
-          this.addInfo.deliveryCity = ''
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryCity = "";
+          this.addInfo.deliveryArea = "";
         } else if (!this.addInfo.deliveryCity) {
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
-    C_list().then(res => {
-      this.categoryList = res.data
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
+    C_list().then((res) => {
+      // 获取产品品类列表
+      this.list.categoryList = res.data;
     }),
-    SelectList().then(res => {
-      this.brandList = res
-    })
+      SelectList().then((res) => {
+        // 获取产品品牌列表
+        this.list.brandList = res;
+      });
   },
   methods: {
     save() {
-      add(this.addInfo).then((res) => {
-        console.log(res)
-      })
-      this.addInfo = {}
+      if (this.valiateProduct()) {
+        if (this.valiateForm()) {
+          add(this.addInfo).then((res) => {
+            // 添加成功
+            this.$message({
+              message: "保存成功",
+              type: "success",
+            });
+            this.addInfo = {
+              userName: "", // 下单人
+              userPhone: "", // 联系方式
+              signDate: "", // 签订日期
+              deliveryDate: "", // 交付日期
+              deliveryProvince: "", // 地址-省
+              deliveryCity: "", // 地址-市
+              deliveryArea: "", // 地址-区
+              deliveryAddress: "", // 详细地址
+              receiver: "", // 收货人
+              receiverPhone: "", // 收货人联系方式
+              remark: "", // 备注
+              productList: [],
+            };
+          });
+        }
+      }
     },
     provinceChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     showAddDialogClick() {
-      this.isShowAdd = true
+      this.isShowAdd = true;
     },
     close() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addTableDataClick() {
-      const obj = {}
-      obj.brandName = this.brandName
-      obj.categoryIds = this.categoryIds
-      obj.productCode = this.productCode
-      obj.productQuantity = this.addInfo.productList.productQuantity
-      obj.productPrice = this.productPrice1
-      this.addInfo.productList.push(obj)
-      this.brandName = '',
-      this.categoryIds = '',
-      this.productCode = '',
-      this.productQuantity1 = '',
-      this.productPrice1 = ''
+      const obj = {};
+      obj.brandName = this.brandName;
+      obj.categoryIds = this.categoryIds;
+      obj.productCode = this.productCode;
+      obj.productQuantity = this.productQuantity1;
+      obj.productPrice = this.productPrice1;
+      this.addInfo.productList.push(obj);
+      (this.brandName = ""),
+        (this.categoryIds = ""),
+        (this.productCode = ""),
+        (this.productQuantity1 = ""),
+        (this.productPrice1 = "");
+    },
+    deleteTableDataClick(tabIndex, row) {
+      this.addInfo.productList = this.addInfo.productList.filter(
+        (product, index) => {
+          return index !== tabIndex;
+        }
+      );
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
-    }
-  }
-}
+      const index = this.list.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      console.log(index);
+      const code = this.list.categoryList[index].id;
+      console.log(code);
+      // 获取产品型号列表
+      list({ categoryId: code }).then((res) => {
+        this.list.CodeList = res;
+      });
+    },
+    valiateProduct() {
+      // 验证产品列表
+      if (this.addInfo.productList.length) {
+        return true;
+      } else {
+        this.$message({
+          message: "产品列表不能为空",
+          type: "error",
+        });
+        return false;
+      }
+    },
+    valiateForm() {
+      const {
+        addInfo: {
+          userName,
+          userPhone,
+          signDate,
+          deliveryDate,
+          deliveryProvince,
+          deliveryCity,
+          deliveryArea,
+          deliveryAddress,
+          receiver,
+          receiverPhone,
+        },
+      } = this;
+      if (
+        userName &&
+        userPhone &&
+        signDate &&
+        deliveryDate &&
+        deliveryProvince &&
+        deliveryCity &&
+        deliveryArea &&
+        deliveryAddress &&
+        receiver &&
+        receiverPhone
+      ) {
+        return true;
+      } else {
+        this.$message({
+          message: "请先填写完整订单信息",
+          type: "error",
+        });
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, '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
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 7930e4c..80a22b2 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="序号" />-->
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -156,10 +156,12 @@
 import {
   C_listPage,
   C_batchDelete,
-  C_delete
+  C_delete, C_listExport
 } from '../../api/product/category'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listExport } from '@/api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default { // 加入分页逻辑
   components: {
@@ -199,6 +201,8 @@
         categoryCode: '',
         categoryName: ''
       }
+      this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 获取指定页面
     getListPage(limit, offset) {
@@ -271,8 +275,19 @@
       this.$refs.addDialog.initDialog('update', row)
     },
     exportToExcel() {
-      C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.data.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      C_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '品类列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 001921f..e1e9818 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -33,10 +33,10 @@
         <div class="inputBox" style="width: 144px">
           <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 categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
+          <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>
         设备状态
@@ -69,7 +69,7 @@
         <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">
@@ -82,6 +82,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{'text-align': 'center' ,background:'  #2483b3',color:'white'}"
@@ -92,13 +93,6 @@
         type="selection"
         width="55"
       />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column
-      prop="id"
-      label="序号"
-
-     >
-    </el-table-column> -->
       <el-table-column
         prop="snCode"
         label="SN码"
@@ -168,10 +162,10 @@
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade } from '../../api/product/device'
+import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade, d_listExport } from '../../api/product/device'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { C_list } from '../../api/product/category'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SelectList } from '../../api/product/brand'
+import { exportFile } from '@/utils/exportutils'
 export default {
   components: {
     DataInfoItem,
@@ -190,7 +184,7 @@
         deviceStatus: '',
         deviceBindUser: ''
       },
-      categoryList: [],
+      brandList: [],
       DevState: [
 
         {
@@ -220,9 +214,8 @@
     d_statistics().then(res => {
       this.statistics = res
     })
-    C_list().then(res => {
-      console.log(res)
-      this.categoryList = res
+    SelectList().then(res => {
+      this.brandList = res
     })
   },
   methods: {
@@ -236,12 +229,16 @@
     // },
     // 获取指定页面
     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.tableData = res
+        this.loading = false
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -253,6 +250,7 @@
         deviceBindUser: ''
       }
       this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 批量删除
     BatchDelete() {
@@ -262,14 +260,14 @@
       dle_ary.forEach(ele => {
         ids.push(ele.id)
       })
-      d_unbind({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      d_unbind({ deviceIds: ids }).then(res => {
+        this.$message({
+          message: res || '解绑成功',
+          type: 'success'
+        })
+        this.refresh()
+      }).catch(_ => {
+
       })
     },
     Upgrade() {
@@ -281,18 +279,27 @@
         ids.push(ele.deviceId)
       })
       d_firmwareUpgrade({ deviceIds: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '升级成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: res || '升级成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     exportToExcel() {
-      d_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      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)
       })
     }
   }

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 33c1a3d..d833399 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -316,12 +316,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+      </div>
+      <div>
           <el-button class="table-btn" @click="handleAddBtn">
             添加项目需求
           </el-button>
         </div>
-      </div>
     </div>
     <div class="btnBox">
       <el-button type="primary" class="save" @click="save">
@@ -421,22 +421,27 @@
   },
   methods: {
     save() {
-      this.addInfo.productList = {
+      if(this.valiateForm()){
+        this.addInfo.productList = {
         productCode: this.addInfo.productList.productCode,
         productQuantity: this.addInfo.productList.productQuantity,
         productPrice: this.addInfo.productList.productPrice,
         productName: ''
       }
       add(this.addInfo).then(res => {
-        console.log(res)
-        if (res) {
+        this.setData()
           this.$message({
             message: '保存成功',
             type: 'success'
           })
-        }
-      })
-      this.setData()
+      }) 
+      } else {
+        this.$message({
+            message: '请先完整填写报备信息',
+            type: 'error'
+          })
+      }
+      
     },
     close() {
       this.setData()
@@ -462,7 +467,6 @@
         this.form.countyList = res
       })
     },
-
     handleAddBtn() {
       const obj = {}
       obj.brandName = ''
@@ -525,6 +529,12 @@
           this.$set(this.showEdit, index, false) // vue添加属性的方法
         }
       })
+      row.productCode = this.addInfo.productList.productCode
+      row.brandName = this.brandName
+      console.log(this.categoryIds)
+      row.categoryIds = this.categoryIds
+      row.productQuantity = this.addInfo.productList.productQuantity
+      row.productPrice = this.addInfo.productList.productPrice
     },
     setData() {
       this.addInfo = {
@@ -553,6 +563,17 @@
         agentPhone: '',
         productList: []
       }
+    },
+    valiateForm() {
+      let arr = []
+      for(var item in this.addInfo) {
+        if(this.addInfo[item]){
+          arr.push(1)
+        }else{
+          arr.push(0)
+        }
+      }
+      return arr.every(item => item === 1)
     }
   }
 }
@@ -568,7 +589,7 @@
 
   .report-from {
     .from-title {
-      font-size: 22px;
+      font-size: 16px;
       font-weight: bold;
       background-color: #28739e;
       color: white;
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 4f061c8..2964d08 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -68,12 +68,11 @@
       <!-- <div>页码</div> -->
     </div>
     <!-- 新增弹框 -->
-
-    <!--    <brand-add-dialog-->
-    <!--      :isShowInfo="isShowAdd"-->
-    <!--      @close="closeAdd"-->
-    <!--    >-->
-    <!--    </brand-add-dialog>-->
+       <brand-add-dialog
+         :isShowInfo="isShowAdd"
+         @close="closeAdd"
+       >
+       </brand-add-dialog>
   </div>
 </template>
 
@@ -103,21 +102,6 @@
           address3: '0.5',
           address4: '每天必做'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
@@ -125,7 +109,8 @@
           label: '黄金糕'
         }
       ],
-      value: ''
+      value: '',
+      input:''
     }
   },
   methods: {
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 1b06442..af68692 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -129,21 +129,6 @@
           address4: '100元',
           address5: '是'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index 1874202..36c7c50 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -2,30 +2,52 @@
 <template>
   <div class="order-container">
     <div class="order-from">
-      <div class="order-title">
-        下订单
-      </div>
+      <div class="order-title">下订单</div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userName" title="下单人" placeholder="请输入下单人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userName"
+            title="下单人"
+            placeholder="请输入下单人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userPhone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userPhone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="签订日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.signDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.signDate"
+              type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
           <inputVue title="交付日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.deliveryDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.deliveryDate"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
@@ -40,7 +62,12 @@
               style="width: 150px; margin-left: 55px"
               @change="provinceChange($event)"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -51,21 +78,47 @@
               style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.deliveryArea" clearable placeholder="县/街道" style="width: 150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-select
+              v-model="addInfo.deliveryArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.deliveryAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.deliveryAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.receiver" title="收货人" placeholder="请输入收货人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.receiver"
+            title="收货人"
+            placeholder="请输入收货人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -81,16 +134,20 @@
       <div class="order-inputBox">
         <div class="input-item">
           <inputVue title="备注" class="inputWidth">
-            <el-input v-model="addInfo.remark" type="textarea" :rows="4" placeholder="请输入备注" style="width: 380px" />
+            <el-input
+              v-model="addInfo.remark"
+              type="textarea"
+              :rows="4"
+              placeholder="请输入备注"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
     </div>
     <div class="order-list">
       <div class="title-box">
-        <div class="list-title">
-          产品列表
-        </div>
+        <div class="list-title">产品列表</div>
       </div>
       <div class="order-table">
         <el-table
@@ -106,7 +163,9 @@
           <el-table-column prop="productPrice" label="产品单价" />
           <el-table-column label="操作">
             <template slot-scope="scope">
-              删除
+              <el-button @click="deleteTableDataClick(scope.$index, scope.row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -116,7 +175,7 @@
             <template slot-scope="scope">
               <el-select v-model="brandName" clearable placeholder="请选择">
                 <el-option
-                  v-for="item in brandList"
+                  v-for="item in list.brandList"
                   :key="item.brandCode"
                   :label="item.brandName"
                   :value="item.brandName"
@@ -128,7 +187,7 @@
             <template slot-scope="scope">
               <el-select v-model="categoryIds" clearable placeholder="请选择" @change="categoryIdChange">
                 <el-option
-                  v-for="item in categoryList"
+                  v-for="item in list.categoryList"
                   :key="item.id"
                   :label="item.categoryName"
                   :value="item.categoryName"
@@ -138,20 +197,26 @@
           </el-table-column>
           <el-table-column prop="productCode" label="产品型号">
             <el-select v-model="productCode" clearable placeholder="请选择">
-              <el-option v-for="item in CodeList" :key="item.id" :label="item.productCode" :value="item.productCode" />
+              <el-option
+                v-for="item in list.codeList"
+                :key="item.id"
+                :label="item.productCode"
+                :value="item.productCode"
+              />
             </el-select>
           </el-table-column>
           <el-table-column prop="productQuantity" label="产品数量">
-            <el-input v-model="addInfo.productList.productQuantity" placeholder="请输入内容" />
+            <el-input
+              v-model="addInfo.productList.productQuantity"
+              placeholder="请输入内容"
+            />
           </el-table-column>
           <el-table-column prop="productPrice" label="产品单价">
             <el-input v-model="productPrice1" placeholder="请输入内容" />
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button @click="addTableDataClick">
-                保存
-              </el-button>
+              <el-button @click="addTableDataClick"> 保存 </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -165,145 +230,223 @@
       </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
       <!-- <el-button type="info" class="close">取消</el-button> -->
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { add, order_area } from '../../api/order/order'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { list } from '../../api/product/product'
+import { add, order_area } from "../../api/order/order";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { list } from "../../api/product/product";
 export default {
+  name:'orderShop',
   components: {
     RedStar,
-    inputVue
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
-      productCode: '',
-      productQuantity1: '',
-      productPrice1: '',
-      CodeList: [],
-      brandList: [],
-      categoryList: [],
-      productList: [{ index: '' }],
+      brandName: "",
+      categoryIds: "",
+      productCode: "",
+      productQuantity1: "",
+      productPrice1: "",
+      list: {
+        codeList: [],
+        brandList: [],
+        categoryList: [],
+      },
+      productList: [{ index: "" }],
       isShowAdd: false, // 添加采购需求
       options: {},
       addInfo: {
-        userName: '', // 下单人
-        userPhone: '', // 联系方式
-        signDate: '', // 签订日期
-        deliveryDate: '', // 交付日期
-        deliveryProvince: '', // 地址-省
-        deliveryCity: '', // 地址-市
-        deliveryArea: '', // 地址-区
-        deliveryAddress: '', // 详细地址
-        receiver: '', // 收货人
-        receiverPhone: '', // 收货人联系方式
-        remark: '', // 备注
-        productList: []
+        userName: "", // 下单人
+        userPhone: "", // 联系方式
+        signDate: "", // 签订日期
+        deliveryDate: "", // 交付日期
+        deliveryProvince: "", // 地址-省
+        deliveryCity: "", // 地址-市
+        deliveryArea: "", // 地址-区
+        deliveryAddress: "", // 详细地址
+        receiver: "", // 收货人
+        receiverPhone: "", // 收货人联系方式
+        remark: "", // 备注
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
+        countyList: [],
       },
       CITY: [],
-      XIAN: []
-    }
+      XIAN: [],
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
         if (!this.addInfo.deliveryProvince) {
-          this.addInfo.deliveryCity = ''
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryCity = "";
+          this.addInfo.deliveryArea = "";
         } else if (!this.addInfo.deliveryCity) {
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
-    C_list().then(res => {
-      this.categoryList = res.data
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
+    C_list().then((res) => {
+      // 获取产品品类列表
+      this.list.categoryList = res.data;
     }),
-    SelectList().then(res => {
-      this.brandList = res
-    })
+      SelectList().then((res) => {
+        // 获取产品品牌列表
+        this.list.brandList = res;
+      });
   },
   methods: {
     save() {
-      add(this.addInfo).then((res) => {
-        console.log(res)
-      })
-      this.addInfo = {}
+      if (this.valiateProduct()) {
+        if (this.valiateForm()) {
+          add(this.addInfo).then((res) => {
+            // 添加成功
+            this.$message({
+              message: "保存成功",
+              type: "success",
+            });
+            this.addInfo = {
+              userName: "", // 下单人
+              userPhone: "", // 联系方式
+              signDate: "", // 签订日期
+              deliveryDate: "", // 交付日期
+              deliveryProvince: "", // 地址-省
+              deliveryCity: "", // 地址-市
+              deliveryArea: "", // 地址-区
+              deliveryAddress: "", // 详细地址
+              receiver: "", // 收货人
+              receiverPhone: "", // 收货人联系方式
+              remark: "", // 备注
+              productList: [],
+            };
+          });
+        }
+      }
     },
     provinceChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     showAddDialogClick() {
-      this.isShowAdd = true
+      this.isShowAdd = true;
     },
     close() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addTableDataClick() {
-      const obj = {}
-      obj.brandName = this.brandName
-      obj.categoryIds = this.categoryIds
-      obj.productCode = this.productCode
-      obj.productQuantity = this.addInfo.productList.productQuantity
-      obj.productPrice = this.productPrice1
-      this.addInfo.productList.push(obj)
-      this.brandName = '',
-      this.categoryIds = '',
-      this.productCode = '',
-      this.productQuantity1 = '',
-      this.productPrice1 = ''
+      const obj = {};
+      obj.brandName = this.brandName;
+      obj.categoryIds = this.categoryIds;
+      obj.productCode = this.productCode;
+      obj.productQuantity = this.productQuantity1;
+      obj.productPrice = this.productPrice1;
+      this.addInfo.productList.push(obj);
+      (this.brandName = ""),
+        (this.categoryIds = ""),
+        (this.productCode = ""),
+        (this.productQuantity1 = ""),
+        (this.productPrice1 = "");
+    },
+    deleteTableDataClick(tabIndex, row) {
+      this.addInfo.productList = this.addInfo.productList.filter(
+        (product, index) => {
+          return index !== tabIndex;
+        }
+      );
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
-    }
-  }
-}
+      const index = this.list.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      console.log(index);
+      const code = this.list.categoryList[index].id;
+      console.log(code);
+      // 获取产品型号列表
+      list({ categoryId: code }).then((res) => {
+        this.list.CodeList = res;
+      });
+    },
+    valiateProduct() {
+      // 验证产品列表
+      if (this.addInfo.productList.length) {
+        return true;
+      } else {
+        this.$message({
+          message: "产品列表不能为空",
+          type: "error",
+        });
+        return false;
+      }
+    },
+    valiateForm() {
+      const {
+        addInfo: {
+          userName,
+          userPhone,
+          signDate,
+          deliveryDate,
+          deliveryProvince,
+          deliveryCity,
+          deliveryArea,
+          deliveryAddress,
+          receiver,
+          receiverPhone,
+        },
+      } = this;
+      if (
+        userName &&
+        userPhone &&
+        signDate &&
+        deliveryDate &&
+        deliveryProvince &&
+        deliveryCity &&
+        deliveryArea &&
+        deliveryAddress &&
+        receiver &&
+        receiverPhone
+      ) {
+        return true;
+      } else {
+        this.$message({
+          message: "请先填写完整订单信息",
+          type: "error",
+        });
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, '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
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 7930e4c..80a22b2 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="序号" />-->
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -156,10 +156,12 @@
 import {
   C_listPage,
   C_batchDelete,
-  C_delete
+  C_delete, C_listExport
 } from '../../api/product/category'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listExport } from '@/api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default { // 加入分页逻辑
   components: {
@@ -199,6 +201,8 @@
         categoryCode: '',
         categoryName: ''
       }
+      this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 获取指定页面
     getListPage(limit, offset) {
@@ -271,8 +275,19 @@
       this.$refs.addDialog.initDialog('update', row)
     },
     exportToExcel() {
-      C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.data.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      C_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '品类列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 001921f..e1e9818 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -33,10 +33,10 @@
         <div class="inputBox" style="width: 144px">
           <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 categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
+          <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>
         设备状态
@@ -69,7 +69,7 @@
         <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">
@@ -82,6 +82,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{'text-align': 'center' ,background:'  #2483b3',color:'white'}"
@@ -92,13 +93,6 @@
         type="selection"
         width="55"
       />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column
-      prop="id"
-      label="序号"
-
-     >
-    </el-table-column> -->
       <el-table-column
         prop="snCode"
         label="SN码"
@@ -168,10 +162,10 @@
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade } from '../../api/product/device'
+import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade, d_listExport } from '../../api/product/device'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { C_list } from '../../api/product/category'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SelectList } from '../../api/product/brand'
+import { exportFile } from '@/utils/exportutils'
 export default {
   components: {
     DataInfoItem,
@@ -190,7 +184,7 @@
         deviceStatus: '',
         deviceBindUser: ''
       },
-      categoryList: [],
+      brandList: [],
       DevState: [
 
         {
@@ -220,9 +214,8 @@
     d_statistics().then(res => {
       this.statistics = res
     })
-    C_list().then(res => {
-      console.log(res)
-      this.categoryList = res
+    SelectList().then(res => {
+      this.brandList = res
     })
   },
   methods: {
@@ -236,12 +229,16 @@
     // },
     // 获取指定页面
     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.tableData = res
+        this.loading = false
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -253,6 +250,7 @@
         deviceBindUser: ''
       }
       this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 批量删除
     BatchDelete() {
@@ -262,14 +260,14 @@
       dle_ary.forEach(ele => {
         ids.push(ele.id)
       })
-      d_unbind({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      d_unbind({ deviceIds: ids }).then(res => {
+        this.$message({
+          message: res || '解绑成功',
+          type: 'success'
+        })
+        this.refresh()
+      }).catch(_ => {
+
       })
     },
     Upgrade() {
@@ -281,18 +279,27 @@
         ids.push(ele.deviceId)
       })
       d_firmwareUpgrade({ deviceIds: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '升级成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: res || '升级成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     exportToExcel() {
-      d_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      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)
       })
     }
   }
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 309ce79..4ee9765 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -39,6 +39,7 @@
       <el-table
         id="out-table"
         ref="multipleTable"
+        v-loading="loading"
         :data="tableData"
         style="width: 100%"
         :row-class-name="tableRowClassName"
@@ -46,7 +47,7 @@
       >
         <el-table-column type="selection" width="55" />
         <!--        <el-table-column type="index" label="编号" width="55" />-->
-        <el-table-column header-align="center" align="center" prop="id" label="序号" />
+        <!--        <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="产品品牌" />
@@ -80,7 +81,7 @@
     </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 v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
+    <productBindDialog ref="bindDialog" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
 
@@ -157,9 +158,11 @@
       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
       })
     },
     setLimit(crrentSize) {
@@ -230,9 +233,11 @@
       this.refresh()
     },
     handleBind(row) {
+      console.log('bindService')
       console.log(row)
-      this.isBindShow = true
       this.dataInfo = row
+      this.$refs.bindDialog.initDialog(row)
+      this.isBindShow = true
     },
     BindDialogClose() {
       this.isBindShow = false

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 33c1a3d..d833399 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -316,12 +316,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+      </div>
+      <div>
           <el-button class="table-btn" @click="handleAddBtn">
             添加项目需求
           </el-button>
         </div>
-      </div>
     </div>
     <div class="btnBox">
       <el-button type="primary" class="save" @click="save">
@@ -421,22 +421,27 @@
   },
   methods: {
     save() {
-      this.addInfo.productList = {
+      if(this.valiateForm()){
+        this.addInfo.productList = {
         productCode: this.addInfo.productList.productCode,
         productQuantity: this.addInfo.productList.productQuantity,
         productPrice: this.addInfo.productList.productPrice,
         productName: ''
       }
       add(this.addInfo).then(res => {
-        console.log(res)
-        if (res) {
+        this.setData()
           this.$message({
             message: '保存成功',
             type: 'success'
           })
-        }
-      })
-      this.setData()
+      }) 
+      } else {
+        this.$message({
+            message: '请先完整填写报备信息',
+            type: 'error'
+          })
+      }
+      
     },
     close() {
       this.setData()
@@ -462,7 +467,6 @@
         this.form.countyList = res
       })
     },
-
     handleAddBtn() {
       const obj = {}
       obj.brandName = ''
@@ -525,6 +529,12 @@
           this.$set(this.showEdit, index, false) // vue添加属性的方法
         }
       })
+      row.productCode = this.addInfo.productList.productCode
+      row.brandName = this.brandName
+      console.log(this.categoryIds)
+      row.categoryIds = this.categoryIds
+      row.productQuantity = this.addInfo.productList.productQuantity
+      row.productPrice = this.addInfo.productList.productPrice
     },
     setData() {
       this.addInfo = {
@@ -553,6 +563,17 @@
         agentPhone: '',
         productList: []
       }
+    },
+    valiateForm() {
+      let arr = []
+      for(var item in this.addInfo) {
+        if(this.addInfo[item]){
+          arr.push(1)
+        }else{
+          arr.push(0)
+        }
+      }
+      return arr.every(item => item === 1)
     }
   }
 }
@@ -568,7 +589,7 @@
 
   .report-from {
     .from-title {
-      font-size: 22px;
+      font-size: 16px;
       font-weight: bold;
       background-color: #28739e;
       color: white;
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 4f061c8..2964d08 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -68,12 +68,11 @@
       <!-- <div>页码</div> -->
     </div>
     <!-- 新增弹框 -->
-
-    <!--    <brand-add-dialog-->
-    <!--      :isShowInfo="isShowAdd"-->
-    <!--      @close="closeAdd"-->
-    <!--    >-->
-    <!--    </brand-add-dialog>-->
+       <brand-add-dialog
+         :isShowInfo="isShowAdd"
+         @close="closeAdd"
+       >
+       </brand-add-dialog>
   </div>
 </template>
 
@@ -103,21 +102,6 @@
           address3: '0.5',
           address4: '每天必做'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
@@ -125,7 +109,8 @@
           label: '黄金糕'
         }
       ],
-      value: ''
+      value: '',
+      input:''
     }
   },
   methods: {
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 1b06442..af68692 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -129,21 +129,6 @@
           address4: '100元',
           address5: '是'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index 1874202..36c7c50 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -2,30 +2,52 @@
 <template>
   <div class="order-container">
     <div class="order-from">
-      <div class="order-title">
-        下订单
-      </div>
+      <div class="order-title">下订单</div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userName" title="下单人" placeholder="请输入下单人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userName"
+            title="下单人"
+            placeholder="请输入下单人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userPhone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userPhone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="签订日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.signDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.signDate"
+              type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
           <inputVue title="交付日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.deliveryDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.deliveryDate"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
@@ -40,7 +62,12 @@
               style="width: 150px; margin-left: 55px"
               @change="provinceChange($event)"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -51,21 +78,47 @@
               style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.deliveryArea" clearable placeholder="县/街道" style="width: 150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-select
+              v-model="addInfo.deliveryArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.deliveryAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.deliveryAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.receiver" title="收货人" placeholder="请输入收货人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.receiver"
+            title="收货人"
+            placeholder="请输入收货人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -81,16 +134,20 @@
       <div class="order-inputBox">
         <div class="input-item">
           <inputVue title="备注" class="inputWidth">
-            <el-input v-model="addInfo.remark" type="textarea" :rows="4" placeholder="请输入备注" style="width: 380px" />
+            <el-input
+              v-model="addInfo.remark"
+              type="textarea"
+              :rows="4"
+              placeholder="请输入备注"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
     </div>
     <div class="order-list">
       <div class="title-box">
-        <div class="list-title">
-          产品列表
-        </div>
+        <div class="list-title">产品列表</div>
       </div>
       <div class="order-table">
         <el-table
@@ -106,7 +163,9 @@
           <el-table-column prop="productPrice" label="产品单价" />
           <el-table-column label="操作">
             <template slot-scope="scope">
-              删除
+              <el-button @click="deleteTableDataClick(scope.$index, scope.row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -116,7 +175,7 @@
             <template slot-scope="scope">
               <el-select v-model="brandName" clearable placeholder="请选择">
                 <el-option
-                  v-for="item in brandList"
+                  v-for="item in list.brandList"
                   :key="item.brandCode"
                   :label="item.brandName"
                   :value="item.brandName"
@@ -128,7 +187,7 @@
             <template slot-scope="scope">
               <el-select v-model="categoryIds" clearable placeholder="请选择" @change="categoryIdChange">
                 <el-option
-                  v-for="item in categoryList"
+                  v-for="item in list.categoryList"
                   :key="item.id"
                   :label="item.categoryName"
                   :value="item.categoryName"
@@ -138,20 +197,26 @@
           </el-table-column>
           <el-table-column prop="productCode" label="产品型号">
             <el-select v-model="productCode" clearable placeholder="请选择">
-              <el-option v-for="item in CodeList" :key="item.id" :label="item.productCode" :value="item.productCode" />
+              <el-option
+                v-for="item in list.codeList"
+                :key="item.id"
+                :label="item.productCode"
+                :value="item.productCode"
+              />
             </el-select>
           </el-table-column>
           <el-table-column prop="productQuantity" label="产品数量">
-            <el-input v-model="addInfo.productList.productQuantity" placeholder="请输入内容" />
+            <el-input
+              v-model="addInfo.productList.productQuantity"
+              placeholder="请输入内容"
+            />
           </el-table-column>
           <el-table-column prop="productPrice" label="产品单价">
             <el-input v-model="productPrice1" placeholder="请输入内容" />
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button @click="addTableDataClick">
-                保存
-              </el-button>
+              <el-button @click="addTableDataClick"> 保存 </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -165,145 +230,223 @@
       </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
       <!-- <el-button type="info" class="close">取消</el-button> -->
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { add, order_area } from '../../api/order/order'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { list } from '../../api/product/product'
+import { add, order_area } from "../../api/order/order";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { list } from "../../api/product/product";
 export default {
+  name:'orderShop',
   components: {
     RedStar,
-    inputVue
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
-      productCode: '',
-      productQuantity1: '',
-      productPrice1: '',
-      CodeList: [],
-      brandList: [],
-      categoryList: [],
-      productList: [{ index: '' }],
+      brandName: "",
+      categoryIds: "",
+      productCode: "",
+      productQuantity1: "",
+      productPrice1: "",
+      list: {
+        codeList: [],
+        brandList: [],
+        categoryList: [],
+      },
+      productList: [{ index: "" }],
       isShowAdd: false, // 添加采购需求
       options: {},
       addInfo: {
-        userName: '', // 下单人
-        userPhone: '', // 联系方式
-        signDate: '', // 签订日期
-        deliveryDate: '', // 交付日期
-        deliveryProvince: '', // 地址-省
-        deliveryCity: '', // 地址-市
-        deliveryArea: '', // 地址-区
-        deliveryAddress: '', // 详细地址
-        receiver: '', // 收货人
-        receiverPhone: '', // 收货人联系方式
-        remark: '', // 备注
-        productList: []
+        userName: "", // 下单人
+        userPhone: "", // 联系方式
+        signDate: "", // 签订日期
+        deliveryDate: "", // 交付日期
+        deliveryProvince: "", // 地址-省
+        deliveryCity: "", // 地址-市
+        deliveryArea: "", // 地址-区
+        deliveryAddress: "", // 详细地址
+        receiver: "", // 收货人
+        receiverPhone: "", // 收货人联系方式
+        remark: "", // 备注
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
+        countyList: [],
       },
       CITY: [],
-      XIAN: []
-    }
+      XIAN: [],
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
         if (!this.addInfo.deliveryProvince) {
-          this.addInfo.deliveryCity = ''
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryCity = "";
+          this.addInfo.deliveryArea = "";
         } else if (!this.addInfo.deliveryCity) {
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
-    C_list().then(res => {
-      this.categoryList = res.data
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
+    C_list().then((res) => {
+      // 获取产品品类列表
+      this.list.categoryList = res.data;
     }),
-    SelectList().then(res => {
-      this.brandList = res
-    })
+      SelectList().then((res) => {
+        // 获取产品品牌列表
+        this.list.brandList = res;
+      });
   },
   methods: {
     save() {
-      add(this.addInfo).then((res) => {
-        console.log(res)
-      })
-      this.addInfo = {}
+      if (this.valiateProduct()) {
+        if (this.valiateForm()) {
+          add(this.addInfo).then((res) => {
+            // 添加成功
+            this.$message({
+              message: "保存成功",
+              type: "success",
+            });
+            this.addInfo = {
+              userName: "", // 下单人
+              userPhone: "", // 联系方式
+              signDate: "", // 签订日期
+              deliveryDate: "", // 交付日期
+              deliveryProvince: "", // 地址-省
+              deliveryCity: "", // 地址-市
+              deliveryArea: "", // 地址-区
+              deliveryAddress: "", // 详细地址
+              receiver: "", // 收货人
+              receiverPhone: "", // 收货人联系方式
+              remark: "", // 备注
+              productList: [],
+            };
+          });
+        }
+      }
     },
     provinceChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     showAddDialogClick() {
-      this.isShowAdd = true
+      this.isShowAdd = true;
     },
     close() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addTableDataClick() {
-      const obj = {}
-      obj.brandName = this.brandName
-      obj.categoryIds = this.categoryIds
-      obj.productCode = this.productCode
-      obj.productQuantity = this.addInfo.productList.productQuantity
-      obj.productPrice = this.productPrice1
-      this.addInfo.productList.push(obj)
-      this.brandName = '',
-      this.categoryIds = '',
-      this.productCode = '',
-      this.productQuantity1 = '',
-      this.productPrice1 = ''
+      const obj = {};
+      obj.brandName = this.brandName;
+      obj.categoryIds = this.categoryIds;
+      obj.productCode = this.productCode;
+      obj.productQuantity = this.productQuantity1;
+      obj.productPrice = this.productPrice1;
+      this.addInfo.productList.push(obj);
+      (this.brandName = ""),
+        (this.categoryIds = ""),
+        (this.productCode = ""),
+        (this.productQuantity1 = ""),
+        (this.productPrice1 = "");
+    },
+    deleteTableDataClick(tabIndex, row) {
+      this.addInfo.productList = this.addInfo.productList.filter(
+        (product, index) => {
+          return index !== tabIndex;
+        }
+      );
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
-    }
-  }
-}
+      const index = this.list.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      console.log(index);
+      const code = this.list.categoryList[index].id;
+      console.log(code);
+      // 获取产品型号列表
+      list({ categoryId: code }).then((res) => {
+        this.list.CodeList = res;
+      });
+    },
+    valiateProduct() {
+      // 验证产品列表
+      if (this.addInfo.productList.length) {
+        return true;
+      } else {
+        this.$message({
+          message: "产品列表不能为空",
+          type: "error",
+        });
+        return false;
+      }
+    },
+    valiateForm() {
+      const {
+        addInfo: {
+          userName,
+          userPhone,
+          signDate,
+          deliveryDate,
+          deliveryProvince,
+          deliveryCity,
+          deliveryArea,
+          deliveryAddress,
+          receiver,
+          receiverPhone,
+        },
+      } = this;
+      if (
+        userName &&
+        userPhone &&
+        signDate &&
+        deliveryDate &&
+        deliveryProvince &&
+        deliveryCity &&
+        deliveryArea &&
+        deliveryAddress &&
+        receiver &&
+        receiverPhone
+      ) {
+        return true;
+      } else {
+        this.$message({
+          message: "请先填写完整订单信息",
+          type: "error",
+        });
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, '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
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 7930e4c..80a22b2 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="序号" />-->
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -156,10 +156,12 @@
 import {
   C_listPage,
   C_batchDelete,
-  C_delete
+  C_delete, C_listExport
 } from '../../api/product/category'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listExport } from '@/api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default { // 加入分页逻辑
   components: {
@@ -199,6 +201,8 @@
         categoryCode: '',
         categoryName: ''
       }
+      this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 获取指定页面
     getListPage(limit, offset) {
@@ -271,8 +275,19 @@
       this.$refs.addDialog.initDialog('update', row)
     },
     exportToExcel() {
-      C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.data.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      C_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '品类列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 001921f..e1e9818 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -33,10 +33,10 @@
         <div class="inputBox" style="width: 144px">
           <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 categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
+          <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>
         设备状态
@@ -69,7 +69,7 @@
         <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">
@@ -82,6 +82,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{'text-align': 'center' ,background:'  #2483b3',color:'white'}"
@@ -92,13 +93,6 @@
         type="selection"
         width="55"
       />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column
-      prop="id"
-      label="序号"
-
-     >
-    </el-table-column> -->
       <el-table-column
         prop="snCode"
         label="SN码"
@@ -168,10 +162,10 @@
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade } from '../../api/product/device'
+import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade, d_listExport } from '../../api/product/device'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { C_list } from '../../api/product/category'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SelectList } from '../../api/product/brand'
+import { exportFile } from '@/utils/exportutils'
 export default {
   components: {
     DataInfoItem,
@@ -190,7 +184,7 @@
         deviceStatus: '',
         deviceBindUser: ''
       },
-      categoryList: [],
+      brandList: [],
       DevState: [
 
         {
@@ -220,9 +214,8 @@
     d_statistics().then(res => {
       this.statistics = res
     })
-    C_list().then(res => {
-      console.log(res)
-      this.categoryList = res
+    SelectList().then(res => {
+      this.brandList = res
     })
   },
   methods: {
@@ -236,12 +229,16 @@
     // },
     // 获取指定页面
     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.tableData = res
+        this.loading = false
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -253,6 +250,7 @@
         deviceBindUser: ''
       }
       this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 批量删除
     BatchDelete() {
@@ -262,14 +260,14 @@
       dle_ary.forEach(ele => {
         ids.push(ele.id)
       })
-      d_unbind({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      d_unbind({ deviceIds: ids }).then(res => {
+        this.$message({
+          message: res || '解绑成功',
+          type: 'success'
+        })
+        this.refresh()
+      }).catch(_ => {
+
       })
     },
     Upgrade() {
@@ -281,18 +279,27 @@
         ids.push(ele.deviceId)
       })
       d_firmwareUpgrade({ deviceIds: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '升级成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: res || '升级成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     exportToExcel() {
-      d_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      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)
       })
     }
   }
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 309ce79..4ee9765 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -39,6 +39,7 @@
       <el-table
         id="out-table"
         ref="multipleTable"
+        v-loading="loading"
         :data="tableData"
         style="width: 100%"
         :row-class-name="tableRowClassName"
@@ -46,7 +47,7 @@
       >
         <el-table-column type="selection" width="55" />
         <!--        <el-table-column type="index" label="编号" width="55" />-->
-        <el-table-column header-align="center" align="center" prop="id" label="序号" />
+        <!--        <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="产品品牌" />
@@ -80,7 +81,7 @@
     </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 v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
+    <productBindDialog ref="bindDialog" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
 
@@ -157,9 +158,11 @@
       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
       })
     },
     setLimit(crrentSize) {
@@ -230,9 +233,11 @@
       this.refresh()
     },
     handleBind(row) {
+      console.log('bindService')
       console.log(row)
-      this.isBindShow = true
       this.dataInfo = row
+      this.$refs.bindDialog.initDialog(row)
+      this.isBindShow = true
     },
     BindDialogClose() {
       this.isBindShow = false
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 3481108..14d8f18 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -67,6 +67,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -78,8 +79,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
+      <!--      <el-table-column prop="index" label="序号" />-->
       <el-table-column prop="snFixedId" label="SN码（固定标识）" />
       <el-table-column prop="snFixedIllustration" label="SN码（固定标识）说明" />
       <el-table-column prop="snStartCode" label="SN码（起始序列号）" />
@@ -125,8 +125,8 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { SN_listPage, SN_batchDelete, SN_delete } from '../../api/product/snCodeField'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listPage, SN_batchDelete, SN_delete, SN_listExport } from '../../api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   components: {
@@ -149,18 +149,23 @@
     tableRowClassName: tableRowClassName,
     closeAdd() {
       this.isShowAdd = false
+      this.refresh()
     },
     addCategory() {
       this.isShowAdd = true
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      SN_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-      // 得到相关数据
+      this.loading = true
+      SN_listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
+        this.loading = false
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -168,44 +173,50 @@
         keyword: '',
         productCode: ''
       }
+      this.limit = 10
+      this.offset = 1
+      this.refresh()
     },
     exportToExcel() {
-      SN_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      SN_listExport(this.selectInfo).then(res => {
+        console.log()
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        let fileName = '设备sn码列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     },
     // 批量删除
     BatchDelete() {
       //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
+      const ids = this.$refs.multipleTable.selection.map(item => item.id)
       SN_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: '删除成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
       const id = row.id
       SN_delete({ id: id }).then(res => {
-        // console.log(res);
         // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: '删除成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     }
   }

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 33c1a3d..d833399 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -316,12 +316,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+      </div>
+      <div>
           <el-button class="table-btn" @click="handleAddBtn">
             添加项目需求
           </el-button>
         </div>
-      </div>
     </div>
     <div class="btnBox">
       <el-button type="primary" class="save" @click="save">
@@ -421,22 +421,27 @@
   },
   methods: {
     save() {
-      this.addInfo.productList = {
+      if(this.valiateForm()){
+        this.addInfo.productList = {
         productCode: this.addInfo.productList.productCode,
         productQuantity: this.addInfo.productList.productQuantity,
         productPrice: this.addInfo.productList.productPrice,
         productName: ''
       }
       add(this.addInfo).then(res => {
-        console.log(res)
-        if (res) {
+        this.setData()
           this.$message({
             message: '保存成功',
             type: 'success'
           })
-        }
-      })
-      this.setData()
+      }) 
+      } else {
+        this.$message({
+            message: '请先完整填写报备信息',
+            type: 'error'
+          })
+      }
+      
     },
     close() {
       this.setData()
@@ -462,7 +467,6 @@
         this.form.countyList = res
       })
     },
-
     handleAddBtn() {
       const obj = {}
       obj.brandName = ''
@@ -525,6 +529,12 @@
           this.$set(this.showEdit, index, false) // vue添加属性的方法
         }
       })
+      row.productCode = this.addInfo.productList.productCode
+      row.brandName = this.brandName
+      console.log(this.categoryIds)
+      row.categoryIds = this.categoryIds
+      row.productQuantity = this.addInfo.productList.productQuantity
+      row.productPrice = this.addInfo.productList.productPrice
     },
     setData() {
       this.addInfo = {
@@ -553,6 +563,17 @@
         agentPhone: '',
         productList: []
       }
+    },
+    valiateForm() {
+      let arr = []
+      for(var item in this.addInfo) {
+        if(this.addInfo[item]){
+          arr.push(1)
+        }else{
+          arr.push(0)
+        }
+      }
+      return arr.every(item => item === 1)
     }
   }
 }
@@ -568,7 +589,7 @@
 
   .report-from {
     .from-title {
-      font-size: 22px;
+      font-size: 16px;
       font-weight: bold;
       background-color: #28739e;
       color: white;
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 4f061c8..2964d08 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -68,12 +68,11 @@
       <!-- <div>页码</div> -->
     </div>
     <!-- 新增弹框 -->
-
-    <!--    <brand-add-dialog-->
-    <!--      :isShowInfo="isShowAdd"-->
-    <!--      @close="closeAdd"-->
-    <!--    >-->
-    <!--    </brand-add-dialog>-->
+       <brand-add-dialog
+         :isShowInfo="isShowAdd"
+         @close="closeAdd"
+       >
+       </brand-add-dialog>
   </div>
 </template>
 
@@ -103,21 +102,6 @@
           address3: '0.5',
           address4: '每天必做'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
@@ -125,7 +109,8 @@
           label: '黄金糕'
         }
       ],
-      value: ''
+      value: '',
+      input:''
     }
   },
   methods: {
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 1b06442..af68692 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -129,21 +129,6 @@
           address4: '100元',
           address5: '是'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index 1874202..36c7c50 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -2,30 +2,52 @@
 <template>
   <div class="order-container">
     <div class="order-from">
-      <div class="order-title">
-        下订单
-      </div>
+      <div class="order-title">下订单</div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userName" title="下单人" placeholder="请输入下单人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userName"
+            title="下单人"
+            placeholder="请输入下单人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userPhone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userPhone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="签订日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.signDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.signDate"
+              type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
           <inputVue title="交付日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.deliveryDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.deliveryDate"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
@@ -40,7 +62,12 @@
               style="width: 150px; margin-left: 55px"
               @change="provinceChange($event)"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -51,21 +78,47 @@
               style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.deliveryArea" clearable placeholder="县/街道" style="width: 150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-select
+              v-model="addInfo.deliveryArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.deliveryAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.deliveryAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.receiver" title="收货人" placeholder="请输入收货人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.receiver"
+            title="收货人"
+            placeholder="请输入收货人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -81,16 +134,20 @@
       <div class="order-inputBox">
         <div class="input-item">
           <inputVue title="备注" class="inputWidth">
-            <el-input v-model="addInfo.remark" type="textarea" :rows="4" placeholder="请输入备注" style="width: 380px" />
+            <el-input
+              v-model="addInfo.remark"
+              type="textarea"
+              :rows="4"
+              placeholder="请输入备注"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
     </div>
     <div class="order-list">
       <div class="title-box">
-        <div class="list-title">
-          产品列表
-        </div>
+        <div class="list-title">产品列表</div>
       </div>
       <div class="order-table">
         <el-table
@@ -106,7 +163,9 @@
           <el-table-column prop="productPrice" label="产品单价" />
           <el-table-column label="操作">
             <template slot-scope="scope">
-              删除
+              <el-button @click="deleteTableDataClick(scope.$index, scope.row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -116,7 +175,7 @@
             <template slot-scope="scope">
               <el-select v-model="brandName" clearable placeholder="请选择">
                 <el-option
-                  v-for="item in brandList"
+                  v-for="item in list.brandList"
                   :key="item.brandCode"
                   :label="item.brandName"
                   :value="item.brandName"
@@ -128,7 +187,7 @@
             <template slot-scope="scope">
               <el-select v-model="categoryIds" clearable placeholder="请选择" @change="categoryIdChange">
                 <el-option
-                  v-for="item in categoryList"
+                  v-for="item in list.categoryList"
                   :key="item.id"
                   :label="item.categoryName"
                   :value="item.categoryName"
@@ -138,20 +197,26 @@
           </el-table-column>
           <el-table-column prop="productCode" label="产品型号">
             <el-select v-model="productCode" clearable placeholder="请选择">
-              <el-option v-for="item in CodeList" :key="item.id" :label="item.productCode" :value="item.productCode" />
+              <el-option
+                v-for="item in list.codeList"
+                :key="item.id"
+                :label="item.productCode"
+                :value="item.productCode"
+              />
             </el-select>
           </el-table-column>
           <el-table-column prop="productQuantity" label="产品数量">
-            <el-input v-model="addInfo.productList.productQuantity" placeholder="请输入内容" />
+            <el-input
+              v-model="addInfo.productList.productQuantity"
+              placeholder="请输入内容"
+            />
           </el-table-column>
           <el-table-column prop="productPrice" label="产品单价">
             <el-input v-model="productPrice1" placeholder="请输入内容" />
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button @click="addTableDataClick">
-                保存
-              </el-button>
+              <el-button @click="addTableDataClick"> 保存 </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -165,145 +230,223 @@
       </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
       <!-- <el-button type="info" class="close">取消</el-button> -->
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { add, order_area } from '../../api/order/order'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { list } from '../../api/product/product'
+import { add, order_area } from "../../api/order/order";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { list } from "../../api/product/product";
 export default {
+  name:'orderShop',
   components: {
     RedStar,
-    inputVue
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
-      productCode: '',
-      productQuantity1: '',
-      productPrice1: '',
-      CodeList: [],
-      brandList: [],
-      categoryList: [],
-      productList: [{ index: '' }],
+      brandName: "",
+      categoryIds: "",
+      productCode: "",
+      productQuantity1: "",
+      productPrice1: "",
+      list: {
+        codeList: [],
+        brandList: [],
+        categoryList: [],
+      },
+      productList: [{ index: "" }],
       isShowAdd: false, // 添加采购需求
       options: {},
       addInfo: {
-        userName: '', // 下单人
-        userPhone: '', // 联系方式
-        signDate: '', // 签订日期
-        deliveryDate: '', // 交付日期
-        deliveryProvince: '', // 地址-省
-        deliveryCity: '', // 地址-市
-        deliveryArea: '', // 地址-区
-        deliveryAddress: '', // 详细地址
-        receiver: '', // 收货人
-        receiverPhone: '', // 收货人联系方式
-        remark: '', // 备注
-        productList: []
+        userName: "", // 下单人
+        userPhone: "", // 联系方式
+        signDate: "", // 签订日期
+        deliveryDate: "", // 交付日期
+        deliveryProvince: "", // 地址-省
+        deliveryCity: "", // 地址-市
+        deliveryArea: "", // 地址-区
+        deliveryAddress: "", // 详细地址
+        receiver: "", // 收货人
+        receiverPhone: "", // 收货人联系方式
+        remark: "", // 备注
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
+        countyList: [],
       },
       CITY: [],
-      XIAN: []
-    }
+      XIAN: [],
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
         if (!this.addInfo.deliveryProvince) {
-          this.addInfo.deliveryCity = ''
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryCity = "";
+          this.addInfo.deliveryArea = "";
         } else if (!this.addInfo.deliveryCity) {
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
-    C_list().then(res => {
-      this.categoryList = res.data
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
+    C_list().then((res) => {
+      // 获取产品品类列表
+      this.list.categoryList = res.data;
     }),
-    SelectList().then(res => {
-      this.brandList = res
-    })
+      SelectList().then((res) => {
+        // 获取产品品牌列表
+        this.list.brandList = res;
+      });
   },
   methods: {
     save() {
-      add(this.addInfo).then((res) => {
-        console.log(res)
-      })
-      this.addInfo = {}
+      if (this.valiateProduct()) {
+        if (this.valiateForm()) {
+          add(this.addInfo).then((res) => {
+            // 添加成功
+            this.$message({
+              message: "保存成功",
+              type: "success",
+            });
+            this.addInfo = {
+              userName: "", // 下单人
+              userPhone: "", // 联系方式
+              signDate: "", // 签订日期
+              deliveryDate: "", // 交付日期
+              deliveryProvince: "", // 地址-省
+              deliveryCity: "", // 地址-市
+              deliveryArea: "", // 地址-区
+              deliveryAddress: "", // 详细地址
+              receiver: "", // 收货人
+              receiverPhone: "", // 收货人联系方式
+              remark: "", // 备注
+              productList: [],
+            };
+          });
+        }
+      }
     },
     provinceChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     showAddDialogClick() {
-      this.isShowAdd = true
+      this.isShowAdd = true;
     },
     close() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addTableDataClick() {
-      const obj = {}
-      obj.brandName = this.brandName
-      obj.categoryIds = this.categoryIds
-      obj.productCode = this.productCode
-      obj.productQuantity = this.addInfo.productList.productQuantity
-      obj.productPrice = this.productPrice1
-      this.addInfo.productList.push(obj)
-      this.brandName = '',
-      this.categoryIds = '',
-      this.productCode = '',
-      this.productQuantity1 = '',
-      this.productPrice1 = ''
+      const obj = {};
+      obj.brandName = this.brandName;
+      obj.categoryIds = this.categoryIds;
+      obj.productCode = this.productCode;
+      obj.productQuantity = this.productQuantity1;
+      obj.productPrice = this.productPrice1;
+      this.addInfo.productList.push(obj);
+      (this.brandName = ""),
+        (this.categoryIds = ""),
+        (this.productCode = ""),
+        (this.productQuantity1 = ""),
+        (this.productPrice1 = "");
+    },
+    deleteTableDataClick(tabIndex, row) {
+      this.addInfo.productList = this.addInfo.productList.filter(
+        (product, index) => {
+          return index !== tabIndex;
+        }
+      );
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
-    }
-  }
-}
+      const index = this.list.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      console.log(index);
+      const code = this.list.categoryList[index].id;
+      console.log(code);
+      // 获取产品型号列表
+      list({ categoryId: code }).then((res) => {
+        this.list.CodeList = res;
+      });
+    },
+    valiateProduct() {
+      // 验证产品列表
+      if (this.addInfo.productList.length) {
+        return true;
+      } else {
+        this.$message({
+          message: "产品列表不能为空",
+          type: "error",
+        });
+        return false;
+      }
+    },
+    valiateForm() {
+      const {
+        addInfo: {
+          userName,
+          userPhone,
+          signDate,
+          deliveryDate,
+          deliveryProvince,
+          deliveryCity,
+          deliveryArea,
+          deliveryAddress,
+          receiver,
+          receiverPhone,
+        },
+      } = this;
+      if (
+        userName &&
+        userPhone &&
+        signDate &&
+        deliveryDate &&
+        deliveryProvince &&
+        deliveryCity &&
+        deliveryArea &&
+        deliveryAddress &&
+        receiver &&
+        receiverPhone
+      ) {
+        return true;
+      } else {
+        this.$message({
+          message: "请先填写完整订单信息",
+          type: "error",
+        });
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, '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
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 7930e4c..80a22b2 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="序号" />-->
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -156,10 +156,12 @@
 import {
   C_listPage,
   C_batchDelete,
-  C_delete
+  C_delete, C_listExport
 } from '../../api/product/category'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listExport } from '@/api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default { // 加入分页逻辑
   components: {
@@ -199,6 +201,8 @@
         categoryCode: '',
         categoryName: ''
       }
+      this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 获取指定页面
     getListPage(limit, offset) {
@@ -271,8 +275,19 @@
       this.$refs.addDialog.initDialog('update', row)
     },
     exportToExcel() {
-      C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.data.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      C_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '品类列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 001921f..e1e9818 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -33,10 +33,10 @@
         <div class="inputBox" style="width: 144px">
           <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 categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
+          <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>
         设备状态
@@ -69,7 +69,7 @@
         <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">
@@ -82,6 +82,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{'text-align': 'center' ,background:'  #2483b3',color:'white'}"
@@ -92,13 +93,6 @@
         type="selection"
         width="55"
       />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column
-      prop="id"
-      label="序号"
-
-     >
-    </el-table-column> -->
       <el-table-column
         prop="snCode"
         label="SN码"
@@ -168,10 +162,10 @@
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade } from '../../api/product/device'
+import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade, d_listExport } from '../../api/product/device'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { C_list } from '../../api/product/category'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SelectList } from '../../api/product/brand'
+import { exportFile } from '@/utils/exportutils'
 export default {
   components: {
     DataInfoItem,
@@ -190,7 +184,7 @@
         deviceStatus: '',
         deviceBindUser: ''
       },
-      categoryList: [],
+      brandList: [],
       DevState: [
 
         {
@@ -220,9 +214,8 @@
     d_statistics().then(res => {
       this.statistics = res
     })
-    C_list().then(res => {
-      console.log(res)
-      this.categoryList = res
+    SelectList().then(res => {
+      this.brandList = res
     })
   },
   methods: {
@@ -236,12 +229,16 @@
     // },
     // 获取指定页面
     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.tableData = res
+        this.loading = false
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -253,6 +250,7 @@
         deviceBindUser: ''
       }
       this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 批量删除
     BatchDelete() {
@@ -262,14 +260,14 @@
       dle_ary.forEach(ele => {
         ids.push(ele.id)
       })
-      d_unbind({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      d_unbind({ deviceIds: ids }).then(res => {
+        this.$message({
+          message: res || '解绑成功',
+          type: 'success'
+        })
+        this.refresh()
+      }).catch(_ => {
+
       })
     },
     Upgrade() {
@@ -281,18 +279,27 @@
         ids.push(ele.deviceId)
       })
       d_firmwareUpgrade({ deviceIds: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '升级成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: res || '升级成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     exportToExcel() {
-      d_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      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)
       })
     }
   }
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 309ce79..4ee9765 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -39,6 +39,7 @@
       <el-table
         id="out-table"
         ref="multipleTable"
+        v-loading="loading"
         :data="tableData"
         style="width: 100%"
         :row-class-name="tableRowClassName"
@@ -46,7 +47,7 @@
       >
         <el-table-column type="selection" width="55" />
         <!--        <el-table-column type="index" label="编号" width="55" />-->
-        <el-table-column header-align="center" align="center" prop="id" label="序号" />
+        <!--        <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="产品品牌" />
@@ -80,7 +81,7 @@
     </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 v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
+    <productBindDialog ref="bindDialog" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
 
@@ -157,9 +158,11 @@
       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
       })
     },
     setLimit(crrentSize) {
@@ -230,9 +233,11 @@
       this.refresh()
     },
     handleBind(row) {
+      console.log('bindService')
       console.log(row)
-      this.isBindShow = true
       this.dataInfo = row
+      this.$refs.bindDialog.initDialog(row)
+      this.isBindShow = true
     },
     BindDialogClose() {
       this.isBindShow = false
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 3481108..14d8f18 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -67,6 +67,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -78,8 +79,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
+      <!--      <el-table-column prop="index" label="序号" />-->
       <el-table-column prop="snFixedId" label="SN码（固定标识）" />
       <el-table-column prop="snFixedIllustration" label="SN码（固定标识）说明" />
       <el-table-column prop="snStartCode" label="SN码（起始序列号）" />
@@ -125,8 +125,8 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { SN_listPage, SN_batchDelete, SN_delete } from '../../api/product/snCodeField'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listPage, SN_batchDelete, SN_delete, SN_listExport } from '../../api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   components: {
@@ -149,18 +149,23 @@
     tableRowClassName: tableRowClassName,
     closeAdd() {
       this.isShowAdd = false
+      this.refresh()
     },
     addCategory() {
       this.isShowAdd = true
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      SN_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-      // 得到相关数据
+      this.loading = true
+      SN_listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
+        this.loading = false
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -168,44 +173,50 @@
         keyword: '',
         productCode: ''
       }
+      this.limit = 10
+      this.offset = 1
+      this.refresh()
     },
     exportToExcel() {
-      SN_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      SN_listExport(this.selectInfo).then(res => {
+        console.log()
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        let fileName = '设备sn码列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     },
     // 批量删除
     BatchDelete() {
       //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
+      const ids = this.$refs.multipleTable.selection.map(item => item.id)
       SN_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: '删除成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
       const id = row.id
       SN_delete({ id: id }).then(res => {
-        // console.log(res);
         // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: '删除成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     }
   }
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 8c0d4cd..58c8ca9 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -32,6 +32,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -43,8 +44,6 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="snCode" label="SN码（固定标识）" />
       <el-table-column prop="snQuantity" label="SN码（固定标识）个数" />
       <el-table-column prop="snIllustration" label="SN码（固定标识）说明" />
@@ -115,12 +114,14 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
+      this.loading = true
       S_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
       })
     },
     reset() {

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 33c1a3d..d833399 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -316,12 +316,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+      </div>
+      <div>
           <el-button class="table-btn" @click="handleAddBtn">
             添加项目需求
           </el-button>
         </div>
-      </div>
     </div>
     <div class="btnBox">
       <el-button type="primary" class="save" @click="save">
@@ -421,22 +421,27 @@
   },
   methods: {
     save() {
-      this.addInfo.productList = {
+      if(this.valiateForm()){
+        this.addInfo.productList = {
         productCode: this.addInfo.productList.productCode,
         productQuantity: this.addInfo.productList.productQuantity,
         productPrice: this.addInfo.productList.productPrice,
         productName: ''
       }
       add(this.addInfo).then(res => {
-        console.log(res)
-        if (res) {
+        this.setData()
           this.$message({
             message: '保存成功',
             type: 'success'
           })
-        }
-      })
-      this.setData()
+      }) 
+      } else {
+        this.$message({
+            message: '请先完整填写报备信息',
+            type: 'error'
+          })
+      }
+      
     },
     close() {
       this.setData()
@@ -462,7 +467,6 @@
         this.form.countyList = res
       })
     },
-
     handleAddBtn() {
       const obj = {}
       obj.brandName = ''
@@ -525,6 +529,12 @@
           this.$set(this.showEdit, index, false) // vue添加属性的方法
         }
       })
+      row.productCode = this.addInfo.productList.productCode
+      row.brandName = this.brandName
+      console.log(this.categoryIds)
+      row.categoryIds = this.categoryIds
+      row.productQuantity = this.addInfo.productList.productQuantity
+      row.productPrice = this.addInfo.productList.productPrice
     },
     setData() {
       this.addInfo = {
@@ -553,6 +563,17 @@
         agentPhone: '',
         productList: []
       }
+    },
+    valiateForm() {
+      let arr = []
+      for(var item in this.addInfo) {
+        if(this.addInfo[item]){
+          arr.push(1)
+        }else{
+          arr.push(0)
+        }
+      }
+      return arr.every(item => item === 1)
     }
   }
 }
@@ -568,7 +589,7 @@
 
   .report-from {
     .from-title {
-      font-size: 22px;
+      font-size: 16px;
       font-weight: bold;
       background-color: #28739e;
       color: white;
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 4f061c8..2964d08 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -68,12 +68,11 @@
       <!-- <div>页码</div> -->
     </div>
     <!-- 新增弹框 -->
-
-    <!--    <brand-add-dialog-->
-    <!--      :isShowInfo="isShowAdd"-->
-    <!--      @close="closeAdd"-->
-    <!--    >-->
-    <!--    </brand-add-dialog>-->
+       <brand-add-dialog
+         :isShowInfo="isShowAdd"
+         @close="closeAdd"
+       >
+       </brand-add-dialog>
   </div>
 </template>
 
@@ -103,21 +102,6 @@
           address3: '0.5',
           address4: '每天必做'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
@@ -125,7 +109,8 @@
           label: '黄金糕'
         }
       ],
-      value: ''
+      value: '',
+      input:''
     }
   },
   methods: {
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 1b06442..af68692 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -129,21 +129,6 @@
           address4: '100元',
           address5: '是'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index 1874202..36c7c50 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -2,30 +2,52 @@
 <template>
   <div class="order-container">
     <div class="order-from">
-      <div class="order-title">
-        下订单
-      </div>
+      <div class="order-title">下订单</div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userName" title="下单人" placeholder="请输入下单人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userName"
+            title="下单人"
+            placeholder="请输入下单人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userPhone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userPhone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="签订日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.signDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.signDate"
+              type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
           <inputVue title="交付日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.deliveryDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.deliveryDate"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
@@ -40,7 +62,12 @@
               style="width: 150px; margin-left: 55px"
               @change="provinceChange($event)"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -51,21 +78,47 @@
               style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.deliveryArea" clearable placeholder="县/街道" style="width: 150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-select
+              v-model="addInfo.deliveryArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.deliveryAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.deliveryAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.receiver" title="收货人" placeholder="请输入收货人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.receiver"
+            title="收货人"
+            placeholder="请输入收货人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -81,16 +134,20 @@
       <div class="order-inputBox">
         <div class="input-item">
           <inputVue title="备注" class="inputWidth">
-            <el-input v-model="addInfo.remark" type="textarea" :rows="4" placeholder="请输入备注" style="width: 380px" />
+            <el-input
+              v-model="addInfo.remark"
+              type="textarea"
+              :rows="4"
+              placeholder="请输入备注"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
     </div>
     <div class="order-list">
       <div class="title-box">
-        <div class="list-title">
-          产品列表
-        </div>
+        <div class="list-title">产品列表</div>
       </div>
       <div class="order-table">
         <el-table
@@ -106,7 +163,9 @@
           <el-table-column prop="productPrice" label="产品单价" />
           <el-table-column label="操作">
             <template slot-scope="scope">
-              删除
+              <el-button @click="deleteTableDataClick(scope.$index, scope.row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -116,7 +175,7 @@
             <template slot-scope="scope">
               <el-select v-model="brandName" clearable placeholder="请选择">
                 <el-option
-                  v-for="item in brandList"
+                  v-for="item in list.brandList"
                   :key="item.brandCode"
                   :label="item.brandName"
                   :value="item.brandName"
@@ -128,7 +187,7 @@
             <template slot-scope="scope">
               <el-select v-model="categoryIds" clearable placeholder="请选择" @change="categoryIdChange">
                 <el-option
-                  v-for="item in categoryList"
+                  v-for="item in list.categoryList"
                   :key="item.id"
                   :label="item.categoryName"
                   :value="item.categoryName"
@@ -138,20 +197,26 @@
           </el-table-column>
           <el-table-column prop="productCode" label="产品型号">
             <el-select v-model="productCode" clearable placeholder="请选择">
-              <el-option v-for="item in CodeList" :key="item.id" :label="item.productCode" :value="item.productCode" />
+              <el-option
+                v-for="item in list.codeList"
+                :key="item.id"
+                :label="item.productCode"
+                :value="item.productCode"
+              />
             </el-select>
           </el-table-column>
           <el-table-column prop="productQuantity" label="产品数量">
-            <el-input v-model="addInfo.productList.productQuantity" placeholder="请输入内容" />
+            <el-input
+              v-model="addInfo.productList.productQuantity"
+              placeholder="请输入内容"
+            />
           </el-table-column>
           <el-table-column prop="productPrice" label="产品单价">
             <el-input v-model="productPrice1" placeholder="请输入内容" />
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button @click="addTableDataClick">
-                保存
-              </el-button>
+              <el-button @click="addTableDataClick"> 保存 </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -165,145 +230,223 @@
       </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
       <!-- <el-button type="info" class="close">取消</el-button> -->
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { add, order_area } from '../../api/order/order'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { list } from '../../api/product/product'
+import { add, order_area } from "../../api/order/order";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { list } from "../../api/product/product";
 export default {
+  name:'orderShop',
   components: {
     RedStar,
-    inputVue
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
-      productCode: '',
-      productQuantity1: '',
-      productPrice1: '',
-      CodeList: [],
-      brandList: [],
-      categoryList: [],
-      productList: [{ index: '' }],
+      brandName: "",
+      categoryIds: "",
+      productCode: "",
+      productQuantity1: "",
+      productPrice1: "",
+      list: {
+        codeList: [],
+        brandList: [],
+        categoryList: [],
+      },
+      productList: [{ index: "" }],
       isShowAdd: false, // 添加采购需求
       options: {},
       addInfo: {
-        userName: '', // 下单人
-        userPhone: '', // 联系方式
-        signDate: '', // 签订日期
-        deliveryDate: '', // 交付日期
-        deliveryProvince: '', // 地址-省
-        deliveryCity: '', // 地址-市
-        deliveryArea: '', // 地址-区
-        deliveryAddress: '', // 详细地址
-        receiver: '', // 收货人
-        receiverPhone: '', // 收货人联系方式
-        remark: '', // 备注
-        productList: []
+        userName: "", // 下单人
+        userPhone: "", // 联系方式
+        signDate: "", // 签订日期
+        deliveryDate: "", // 交付日期
+        deliveryProvince: "", // 地址-省
+        deliveryCity: "", // 地址-市
+        deliveryArea: "", // 地址-区
+        deliveryAddress: "", // 详细地址
+        receiver: "", // 收货人
+        receiverPhone: "", // 收货人联系方式
+        remark: "", // 备注
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
+        countyList: [],
       },
       CITY: [],
-      XIAN: []
-    }
+      XIAN: [],
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
         if (!this.addInfo.deliveryProvince) {
-          this.addInfo.deliveryCity = ''
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryCity = "";
+          this.addInfo.deliveryArea = "";
         } else if (!this.addInfo.deliveryCity) {
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
-    C_list().then(res => {
-      this.categoryList = res.data
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
+    C_list().then((res) => {
+      // 获取产品品类列表
+      this.list.categoryList = res.data;
     }),
-    SelectList().then(res => {
-      this.brandList = res
-    })
+      SelectList().then((res) => {
+        // 获取产品品牌列表
+        this.list.brandList = res;
+      });
   },
   methods: {
     save() {
-      add(this.addInfo).then((res) => {
-        console.log(res)
-      })
-      this.addInfo = {}
+      if (this.valiateProduct()) {
+        if (this.valiateForm()) {
+          add(this.addInfo).then((res) => {
+            // 添加成功
+            this.$message({
+              message: "保存成功",
+              type: "success",
+            });
+            this.addInfo = {
+              userName: "", // 下单人
+              userPhone: "", // 联系方式
+              signDate: "", // 签订日期
+              deliveryDate: "", // 交付日期
+              deliveryProvince: "", // 地址-省
+              deliveryCity: "", // 地址-市
+              deliveryArea: "", // 地址-区
+              deliveryAddress: "", // 详细地址
+              receiver: "", // 收货人
+              receiverPhone: "", // 收货人联系方式
+              remark: "", // 备注
+              productList: [],
+            };
+          });
+        }
+      }
     },
     provinceChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     showAddDialogClick() {
-      this.isShowAdd = true
+      this.isShowAdd = true;
     },
     close() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addTableDataClick() {
-      const obj = {}
-      obj.brandName = this.brandName
-      obj.categoryIds = this.categoryIds
-      obj.productCode = this.productCode
-      obj.productQuantity = this.addInfo.productList.productQuantity
-      obj.productPrice = this.productPrice1
-      this.addInfo.productList.push(obj)
-      this.brandName = '',
-      this.categoryIds = '',
-      this.productCode = '',
-      this.productQuantity1 = '',
-      this.productPrice1 = ''
+      const obj = {};
+      obj.brandName = this.brandName;
+      obj.categoryIds = this.categoryIds;
+      obj.productCode = this.productCode;
+      obj.productQuantity = this.productQuantity1;
+      obj.productPrice = this.productPrice1;
+      this.addInfo.productList.push(obj);
+      (this.brandName = ""),
+        (this.categoryIds = ""),
+        (this.productCode = ""),
+        (this.productQuantity1 = ""),
+        (this.productPrice1 = "");
+    },
+    deleteTableDataClick(tabIndex, row) {
+      this.addInfo.productList = this.addInfo.productList.filter(
+        (product, index) => {
+          return index !== tabIndex;
+        }
+      );
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
-    }
-  }
-}
+      const index = this.list.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      console.log(index);
+      const code = this.list.categoryList[index].id;
+      console.log(code);
+      // 获取产品型号列表
+      list({ categoryId: code }).then((res) => {
+        this.list.CodeList = res;
+      });
+    },
+    valiateProduct() {
+      // 验证产品列表
+      if (this.addInfo.productList.length) {
+        return true;
+      } else {
+        this.$message({
+          message: "产品列表不能为空",
+          type: "error",
+        });
+        return false;
+      }
+    },
+    valiateForm() {
+      const {
+        addInfo: {
+          userName,
+          userPhone,
+          signDate,
+          deliveryDate,
+          deliveryProvince,
+          deliveryCity,
+          deliveryArea,
+          deliveryAddress,
+          receiver,
+          receiverPhone,
+        },
+      } = this;
+      if (
+        userName &&
+        userPhone &&
+        signDate &&
+        deliveryDate &&
+        deliveryProvince &&
+        deliveryCity &&
+        deliveryArea &&
+        deliveryAddress &&
+        receiver &&
+        receiverPhone
+      ) {
+        return true;
+      } else {
+        this.$message({
+          message: "请先填写完整订单信息",
+          type: "error",
+        });
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, '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
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 7930e4c..80a22b2 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="序号" />-->
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -156,10 +156,12 @@
 import {
   C_listPage,
   C_batchDelete,
-  C_delete
+  C_delete, C_listExport
 } from '../../api/product/category'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listExport } from '@/api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default { // 加入分页逻辑
   components: {
@@ -199,6 +201,8 @@
         categoryCode: '',
         categoryName: ''
       }
+      this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 获取指定页面
     getListPage(limit, offset) {
@@ -271,8 +275,19 @@
       this.$refs.addDialog.initDialog('update', row)
     },
     exportToExcel() {
-      C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.data.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      C_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '品类列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 001921f..e1e9818 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -33,10 +33,10 @@
         <div class="inputBox" style="width: 144px">
           <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 categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
+          <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>
         设备状态
@@ -69,7 +69,7 @@
         <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">
@@ -82,6 +82,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{'text-align': 'center' ,background:'  #2483b3',color:'white'}"
@@ -92,13 +93,6 @@
         type="selection"
         width="55"
       />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column
-      prop="id"
-      label="序号"
-
-     >
-    </el-table-column> -->
       <el-table-column
         prop="snCode"
         label="SN码"
@@ -168,10 +162,10 @@
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade } from '../../api/product/device'
+import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade, d_listExport } from '../../api/product/device'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { C_list } from '../../api/product/category'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SelectList } from '../../api/product/brand'
+import { exportFile } from '@/utils/exportutils'
 export default {
   components: {
     DataInfoItem,
@@ -190,7 +184,7 @@
         deviceStatus: '',
         deviceBindUser: ''
       },
-      categoryList: [],
+      brandList: [],
       DevState: [
 
         {
@@ -220,9 +214,8 @@
     d_statistics().then(res => {
       this.statistics = res
     })
-    C_list().then(res => {
-      console.log(res)
-      this.categoryList = res
+    SelectList().then(res => {
+      this.brandList = res
     })
   },
   methods: {
@@ -236,12 +229,16 @@
     // },
     // 获取指定页面
     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.tableData = res
+        this.loading = false
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -253,6 +250,7 @@
         deviceBindUser: ''
       }
       this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 批量删除
     BatchDelete() {
@@ -262,14 +260,14 @@
       dle_ary.forEach(ele => {
         ids.push(ele.id)
       })
-      d_unbind({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      d_unbind({ deviceIds: ids }).then(res => {
+        this.$message({
+          message: res || '解绑成功',
+          type: 'success'
+        })
+        this.refresh()
+      }).catch(_ => {
+
       })
     },
     Upgrade() {
@@ -281,18 +279,27 @@
         ids.push(ele.deviceId)
       })
       d_firmwareUpgrade({ deviceIds: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '升级成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: res || '升级成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     exportToExcel() {
-      d_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      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)
       })
     }
   }
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 309ce79..4ee9765 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -39,6 +39,7 @@
       <el-table
         id="out-table"
         ref="multipleTable"
+        v-loading="loading"
         :data="tableData"
         style="width: 100%"
         :row-class-name="tableRowClassName"
@@ -46,7 +47,7 @@
       >
         <el-table-column type="selection" width="55" />
         <!--        <el-table-column type="index" label="编号" width="55" />-->
-        <el-table-column header-align="center" align="center" prop="id" label="序号" />
+        <!--        <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="产品品牌" />
@@ -80,7 +81,7 @@
     </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 v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
+    <productBindDialog ref="bindDialog" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
 
@@ -157,9 +158,11 @@
       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
       })
     },
     setLimit(crrentSize) {
@@ -230,9 +233,11 @@
       this.refresh()
     },
     handleBind(row) {
+      console.log('bindService')
       console.log(row)
-      this.isBindShow = true
       this.dataInfo = row
+      this.$refs.bindDialog.initDialog(row)
+      this.isBindShow = true
     },
     BindDialogClose() {
       this.isBindShow = false
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 3481108..14d8f18 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -67,6 +67,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -78,8 +79,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
+      <!--      <el-table-column prop="index" label="序号" />-->
       <el-table-column prop="snFixedId" label="SN码（固定标识）" />
       <el-table-column prop="snFixedIllustration" label="SN码（固定标识）说明" />
       <el-table-column prop="snStartCode" label="SN码（起始序列号）" />
@@ -125,8 +125,8 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { SN_listPage, SN_batchDelete, SN_delete } from '../../api/product/snCodeField'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listPage, SN_batchDelete, SN_delete, SN_listExport } from '../../api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   components: {
@@ -149,18 +149,23 @@
     tableRowClassName: tableRowClassName,
     closeAdd() {
       this.isShowAdd = false
+      this.refresh()
     },
     addCategory() {
       this.isShowAdd = true
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      SN_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-      // 得到相关数据
+      this.loading = true
+      SN_listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
+        this.loading = false
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -168,44 +173,50 @@
         keyword: '',
         productCode: ''
       }
+      this.limit = 10
+      this.offset = 1
+      this.refresh()
     },
     exportToExcel() {
-      SN_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      SN_listExport(this.selectInfo).then(res => {
+        console.log()
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        let fileName = '设备sn码列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     },
     // 批量删除
     BatchDelete() {
       //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
+      const ids = this.$refs.multipleTable.selection.map(item => item.id)
       SN_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: '删除成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
       const id = row.id
       SN_delete({ id: id }).then(res => {
-        // console.log(res);
         // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: '删除成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     }
   }
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 8c0d4cd..58c8ca9 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -32,6 +32,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -43,8 +44,6 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="snCode" label="SN码（固定标识）" />
       <el-table-column prop="snQuantity" label="SN码（固定标识）个数" />
       <el-table-column prop="snIllustration" label="SN码（固定标识）说明" />
@@ -115,12 +114,14 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
+      this.loading = true
       S_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
       })
     },
     reset() {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index f573fd8..bed5935 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -21,7 +21,12 @@
             placeholder="请选择服务类型"
             style="width: 200px"
           >
-            <el-option v-for="item in options" :key="item.id" :label="item.typeName" :value="item.typeCode" />
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.typeName"
+              :value="item.typeCode"
+            />
           </el-select>
         </div>
       </div>
@@ -34,7 +39,14 @@
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -47,7 +59,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -64,6 +76,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -75,18 +88,10 @@
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -117,100 +122,141 @@
 
 <script>
 // 组件
-import ManagementAddDialog from '../../components/mycomponent/dialog/server/managementAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ManagementAddDialog from "../../components/mycomponent/dialog/server/managementAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { listPage, M_batchDelete, M_delete } from '../../api/server/Management'
-import { TM_list } from '../../api/server/TypeManagement'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { listPage, M_batchDelete, M_delete } from "../../api/server/Management";
+import { TM_list } from "../../api/server/TypeManagement";
 
 export default {
   components: {
     ManagementAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        serviceName: '',
-        typeCode: ''
+        serviceName: "",
+        typeCode: "",
       },
       options: [],
-      title: ''
-    }
+      title: "",
+      loading:false
+    };
   },
   mounted() {
-    TM_list().then(res => {
-      console.log(res)
-      this.options = res
-    })
+    TM_list().then((res) => {
+      console.log(res);
+      this.options = res;
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.title = '服务新增'
-      this.isShowAdd = true
-      this.rowInfo = ''
+      this.title = "服务新增";
+      this.isShowAdd = true;
+      this.rowInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+        id: "",
+      };
     },
     handleClick(row) {
-      this.title = '服务编辑'
-      this.isShowAdd = true
-      console.log(row)
-      this.rowInfo = row
+      this.title = "服务编辑";
+      this.isShowAdd = true;
+      console.log(row);
+      this.rowInfo = row;
+    },
+    reset() {
+      // 重置
+      this.selectInfo = {
+        serviceName: "",
+        typeCode: "",
+      };
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      M_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            M_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      M_delete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          M_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -252,7 +298,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 33c1a3d..d833399 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -316,12 +316,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+      </div>
+      <div>
           <el-button class="table-btn" @click="handleAddBtn">
             添加项目需求
           </el-button>
         </div>
-      </div>
     </div>
     <div class="btnBox">
       <el-button type="primary" class="save" @click="save">
@@ -421,22 +421,27 @@
   },
   methods: {
     save() {
-      this.addInfo.productList = {
+      if(this.valiateForm()){
+        this.addInfo.productList = {
         productCode: this.addInfo.productList.productCode,
         productQuantity: this.addInfo.productList.productQuantity,
         productPrice: this.addInfo.productList.productPrice,
         productName: ''
       }
       add(this.addInfo).then(res => {
-        console.log(res)
-        if (res) {
+        this.setData()
           this.$message({
             message: '保存成功',
             type: 'success'
           })
-        }
-      })
-      this.setData()
+      }) 
+      } else {
+        this.$message({
+            message: '请先完整填写报备信息',
+            type: 'error'
+          })
+      }
+      
     },
     close() {
       this.setData()
@@ -462,7 +467,6 @@
         this.form.countyList = res
       })
     },
-
     handleAddBtn() {
       const obj = {}
       obj.brandName = ''
@@ -525,6 +529,12 @@
           this.$set(this.showEdit, index, false) // vue添加属性的方法
         }
       })
+      row.productCode = this.addInfo.productList.productCode
+      row.brandName = this.brandName
+      console.log(this.categoryIds)
+      row.categoryIds = this.categoryIds
+      row.productQuantity = this.addInfo.productList.productQuantity
+      row.productPrice = this.addInfo.productList.productPrice
     },
     setData() {
       this.addInfo = {
@@ -553,6 +563,17 @@
         agentPhone: '',
         productList: []
       }
+    },
+    valiateForm() {
+      let arr = []
+      for(var item in this.addInfo) {
+        if(this.addInfo[item]){
+          arr.push(1)
+        }else{
+          arr.push(0)
+        }
+      }
+      return arr.every(item => item === 1)
     }
   }
 }
@@ -568,7 +589,7 @@
 
   .report-from {
     .from-title {
-      font-size: 22px;
+      font-size: 16px;
       font-weight: bold;
       background-color: #28739e;
       color: white;
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 4f061c8..2964d08 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -68,12 +68,11 @@
       <!-- <div>页码</div> -->
     </div>
     <!-- 新增弹框 -->
-
-    <!--    <brand-add-dialog-->
-    <!--      :isShowInfo="isShowAdd"-->
-    <!--      @close="closeAdd"-->
-    <!--    >-->
-    <!--    </brand-add-dialog>-->
+       <brand-add-dialog
+         :isShowInfo="isShowAdd"
+         @close="closeAdd"
+       >
+       </brand-add-dialog>
   </div>
 </template>
 
@@ -103,21 +102,6 @@
           address3: '0.5',
           address4: '每天必做'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
@@ -125,7 +109,8 @@
           label: '黄金糕'
         }
       ],
-      value: ''
+      value: '',
+      input:''
     }
   },
   methods: {
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 1b06442..af68692 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -129,21 +129,6 @@
           address4: '100元',
           address5: '是'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index 1874202..36c7c50 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -2,30 +2,52 @@
 <template>
   <div class="order-container">
     <div class="order-from">
-      <div class="order-title">
-        下订单
-      </div>
+      <div class="order-title">下订单</div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userName" title="下单人" placeholder="请输入下单人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userName"
+            title="下单人"
+            placeholder="请输入下单人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userPhone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userPhone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="签订日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.signDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.signDate"
+              type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
           <inputVue title="交付日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.deliveryDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.deliveryDate"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
@@ -40,7 +62,12 @@
               style="width: 150px; margin-left: 55px"
               @change="provinceChange($event)"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -51,21 +78,47 @@
               style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.deliveryArea" clearable placeholder="县/街道" style="width: 150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-select
+              v-model="addInfo.deliveryArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.deliveryAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.deliveryAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.receiver" title="收货人" placeholder="请输入收货人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.receiver"
+            title="收货人"
+            placeholder="请输入收货人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -81,16 +134,20 @@
       <div class="order-inputBox">
         <div class="input-item">
           <inputVue title="备注" class="inputWidth">
-            <el-input v-model="addInfo.remark" type="textarea" :rows="4" placeholder="请输入备注" style="width: 380px" />
+            <el-input
+              v-model="addInfo.remark"
+              type="textarea"
+              :rows="4"
+              placeholder="请输入备注"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
     </div>
     <div class="order-list">
       <div class="title-box">
-        <div class="list-title">
-          产品列表
-        </div>
+        <div class="list-title">产品列表</div>
       </div>
       <div class="order-table">
         <el-table
@@ -106,7 +163,9 @@
           <el-table-column prop="productPrice" label="产品单价" />
           <el-table-column label="操作">
             <template slot-scope="scope">
-              删除
+              <el-button @click="deleteTableDataClick(scope.$index, scope.row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -116,7 +175,7 @@
             <template slot-scope="scope">
               <el-select v-model="brandName" clearable placeholder="请选择">
                 <el-option
-                  v-for="item in brandList"
+                  v-for="item in list.brandList"
                   :key="item.brandCode"
                   :label="item.brandName"
                   :value="item.brandName"
@@ -128,7 +187,7 @@
             <template slot-scope="scope">
               <el-select v-model="categoryIds" clearable placeholder="请选择" @change="categoryIdChange">
                 <el-option
-                  v-for="item in categoryList"
+                  v-for="item in list.categoryList"
                   :key="item.id"
                   :label="item.categoryName"
                   :value="item.categoryName"
@@ -138,20 +197,26 @@
           </el-table-column>
           <el-table-column prop="productCode" label="产品型号">
             <el-select v-model="productCode" clearable placeholder="请选择">
-              <el-option v-for="item in CodeList" :key="item.id" :label="item.productCode" :value="item.productCode" />
+              <el-option
+                v-for="item in list.codeList"
+                :key="item.id"
+                :label="item.productCode"
+                :value="item.productCode"
+              />
             </el-select>
           </el-table-column>
           <el-table-column prop="productQuantity" label="产品数量">
-            <el-input v-model="addInfo.productList.productQuantity" placeholder="请输入内容" />
+            <el-input
+              v-model="addInfo.productList.productQuantity"
+              placeholder="请输入内容"
+            />
           </el-table-column>
           <el-table-column prop="productPrice" label="产品单价">
             <el-input v-model="productPrice1" placeholder="请输入内容" />
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button @click="addTableDataClick">
-                保存
-              </el-button>
+              <el-button @click="addTableDataClick"> 保存 </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -165,145 +230,223 @@
       </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
       <!-- <el-button type="info" class="close">取消</el-button> -->
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { add, order_area } from '../../api/order/order'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { list } from '../../api/product/product'
+import { add, order_area } from "../../api/order/order";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { list } from "../../api/product/product";
 export default {
+  name:'orderShop',
   components: {
     RedStar,
-    inputVue
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
-      productCode: '',
-      productQuantity1: '',
-      productPrice1: '',
-      CodeList: [],
-      brandList: [],
-      categoryList: [],
-      productList: [{ index: '' }],
+      brandName: "",
+      categoryIds: "",
+      productCode: "",
+      productQuantity1: "",
+      productPrice1: "",
+      list: {
+        codeList: [],
+        brandList: [],
+        categoryList: [],
+      },
+      productList: [{ index: "" }],
       isShowAdd: false, // 添加采购需求
       options: {},
       addInfo: {
-        userName: '', // 下单人
-        userPhone: '', // 联系方式
-        signDate: '', // 签订日期
-        deliveryDate: '', // 交付日期
-        deliveryProvince: '', // 地址-省
-        deliveryCity: '', // 地址-市
-        deliveryArea: '', // 地址-区
-        deliveryAddress: '', // 详细地址
-        receiver: '', // 收货人
-        receiverPhone: '', // 收货人联系方式
-        remark: '', // 备注
-        productList: []
+        userName: "", // 下单人
+        userPhone: "", // 联系方式
+        signDate: "", // 签订日期
+        deliveryDate: "", // 交付日期
+        deliveryProvince: "", // 地址-省
+        deliveryCity: "", // 地址-市
+        deliveryArea: "", // 地址-区
+        deliveryAddress: "", // 详细地址
+        receiver: "", // 收货人
+        receiverPhone: "", // 收货人联系方式
+        remark: "", // 备注
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
+        countyList: [],
       },
       CITY: [],
-      XIAN: []
-    }
+      XIAN: [],
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
         if (!this.addInfo.deliveryProvince) {
-          this.addInfo.deliveryCity = ''
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryCity = "";
+          this.addInfo.deliveryArea = "";
         } else if (!this.addInfo.deliveryCity) {
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
-    C_list().then(res => {
-      this.categoryList = res.data
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
+    C_list().then((res) => {
+      // 获取产品品类列表
+      this.list.categoryList = res.data;
     }),
-    SelectList().then(res => {
-      this.brandList = res
-    })
+      SelectList().then((res) => {
+        // 获取产品品牌列表
+        this.list.brandList = res;
+      });
   },
   methods: {
     save() {
-      add(this.addInfo).then((res) => {
-        console.log(res)
-      })
-      this.addInfo = {}
+      if (this.valiateProduct()) {
+        if (this.valiateForm()) {
+          add(this.addInfo).then((res) => {
+            // 添加成功
+            this.$message({
+              message: "保存成功",
+              type: "success",
+            });
+            this.addInfo = {
+              userName: "", // 下单人
+              userPhone: "", // 联系方式
+              signDate: "", // 签订日期
+              deliveryDate: "", // 交付日期
+              deliveryProvince: "", // 地址-省
+              deliveryCity: "", // 地址-市
+              deliveryArea: "", // 地址-区
+              deliveryAddress: "", // 详细地址
+              receiver: "", // 收货人
+              receiverPhone: "", // 收货人联系方式
+              remark: "", // 备注
+              productList: [],
+            };
+          });
+        }
+      }
     },
     provinceChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     showAddDialogClick() {
-      this.isShowAdd = true
+      this.isShowAdd = true;
     },
     close() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addTableDataClick() {
-      const obj = {}
-      obj.brandName = this.brandName
-      obj.categoryIds = this.categoryIds
-      obj.productCode = this.productCode
-      obj.productQuantity = this.addInfo.productList.productQuantity
-      obj.productPrice = this.productPrice1
-      this.addInfo.productList.push(obj)
-      this.brandName = '',
-      this.categoryIds = '',
-      this.productCode = '',
-      this.productQuantity1 = '',
-      this.productPrice1 = ''
+      const obj = {};
+      obj.brandName = this.brandName;
+      obj.categoryIds = this.categoryIds;
+      obj.productCode = this.productCode;
+      obj.productQuantity = this.productQuantity1;
+      obj.productPrice = this.productPrice1;
+      this.addInfo.productList.push(obj);
+      (this.brandName = ""),
+        (this.categoryIds = ""),
+        (this.productCode = ""),
+        (this.productQuantity1 = ""),
+        (this.productPrice1 = "");
+    },
+    deleteTableDataClick(tabIndex, row) {
+      this.addInfo.productList = this.addInfo.productList.filter(
+        (product, index) => {
+          return index !== tabIndex;
+        }
+      );
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
-    }
-  }
-}
+      const index = this.list.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      console.log(index);
+      const code = this.list.categoryList[index].id;
+      console.log(code);
+      // 获取产品型号列表
+      list({ categoryId: code }).then((res) => {
+        this.list.CodeList = res;
+      });
+    },
+    valiateProduct() {
+      // 验证产品列表
+      if (this.addInfo.productList.length) {
+        return true;
+      } else {
+        this.$message({
+          message: "产品列表不能为空",
+          type: "error",
+        });
+        return false;
+      }
+    },
+    valiateForm() {
+      const {
+        addInfo: {
+          userName,
+          userPhone,
+          signDate,
+          deliveryDate,
+          deliveryProvince,
+          deliveryCity,
+          deliveryArea,
+          deliveryAddress,
+          receiver,
+          receiverPhone,
+        },
+      } = this;
+      if (
+        userName &&
+        userPhone &&
+        signDate &&
+        deliveryDate &&
+        deliveryProvince &&
+        deliveryCity &&
+        deliveryArea &&
+        deliveryAddress &&
+        receiver &&
+        receiverPhone
+      ) {
+        return true;
+      } else {
+        this.$message({
+          message: "请先填写完整订单信息",
+          type: "error",
+        });
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, '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
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 7930e4c..80a22b2 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="序号" />-->
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -156,10 +156,12 @@
 import {
   C_listPage,
   C_batchDelete,
-  C_delete
+  C_delete, C_listExport
 } from '../../api/product/category'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listExport } from '@/api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default { // 加入分页逻辑
   components: {
@@ -199,6 +201,8 @@
         categoryCode: '',
         categoryName: ''
       }
+      this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 获取指定页面
     getListPage(limit, offset) {
@@ -271,8 +275,19 @@
       this.$refs.addDialog.initDialog('update', row)
     },
     exportToExcel() {
-      C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.data.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      C_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '品类列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 001921f..e1e9818 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -33,10 +33,10 @@
         <div class="inputBox" style="width: 144px">
           <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 categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
+          <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>
         设备状态
@@ -69,7 +69,7 @@
         <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">
@@ -82,6 +82,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{'text-align': 'center' ,background:'  #2483b3',color:'white'}"
@@ -92,13 +93,6 @@
         type="selection"
         width="55"
       />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column
-      prop="id"
-      label="序号"
-
-     >
-    </el-table-column> -->
       <el-table-column
         prop="snCode"
         label="SN码"
@@ -168,10 +162,10 @@
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade } from '../../api/product/device'
+import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade, d_listExport } from '../../api/product/device'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { C_list } from '../../api/product/category'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SelectList } from '../../api/product/brand'
+import { exportFile } from '@/utils/exportutils'
 export default {
   components: {
     DataInfoItem,
@@ -190,7 +184,7 @@
         deviceStatus: '',
         deviceBindUser: ''
       },
-      categoryList: [],
+      brandList: [],
       DevState: [
 
         {
@@ -220,9 +214,8 @@
     d_statistics().then(res => {
       this.statistics = res
     })
-    C_list().then(res => {
-      console.log(res)
-      this.categoryList = res
+    SelectList().then(res => {
+      this.brandList = res
     })
   },
   methods: {
@@ -236,12 +229,16 @@
     // },
     // 获取指定页面
     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.tableData = res
+        this.loading = false
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -253,6 +250,7 @@
         deviceBindUser: ''
       }
       this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 批量删除
     BatchDelete() {
@@ -262,14 +260,14 @@
       dle_ary.forEach(ele => {
         ids.push(ele.id)
       })
-      d_unbind({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      d_unbind({ deviceIds: ids }).then(res => {
+        this.$message({
+          message: res || '解绑成功',
+          type: 'success'
+        })
+        this.refresh()
+      }).catch(_ => {
+
       })
     },
     Upgrade() {
@@ -281,18 +279,27 @@
         ids.push(ele.deviceId)
       })
       d_firmwareUpgrade({ deviceIds: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '升级成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: res || '升级成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     exportToExcel() {
-      d_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      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)
       })
     }
   }
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 309ce79..4ee9765 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -39,6 +39,7 @@
       <el-table
         id="out-table"
         ref="multipleTable"
+        v-loading="loading"
         :data="tableData"
         style="width: 100%"
         :row-class-name="tableRowClassName"
@@ -46,7 +47,7 @@
       >
         <el-table-column type="selection" width="55" />
         <!--        <el-table-column type="index" label="编号" width="55" />-->
-        <el-table-column header-align="center" align="center" prop="id" label="序号" />
+        <!--        <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="产品品牌" />
@@ -80,7 +81,7 @@
     </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 v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
+    <productBindDialog ref="bindDialog" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
 
@@ -157,9 +158,11 @@
       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
       })
     },
     setLimit(crrentSize) {
@@ -230,9 +233,11 @@
       this.refresh()
     },
     handleBind(row) {
+      console.log('bindService')
       console.log(row)
-      this.isBindShow = true
       this.dataInfo = row
+      this.$refs.bindDialog.initDialog(row)
+      this.isBindShow = true
     },
     BindDialogClose() {
       this.isBindShow = false
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 3481108..14d8f18 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -67,6 +67,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -78,8 +79,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
+      <!--      <el-table-column prop="index" label="序号" />-->
       <el-table-column prop="snFixedId" label="SN码（固定标识）" />
       <el-table-column prop="snFixedIllustration" label="SN码（固定标识）说明" />
       <el-table-column prop="snStartCode" label="SN码（起始序列号）" />
@@ -125,8 +125,8 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { SN_listPage, SN_batchDelete, SN_delete } from '../../api/product/snCodeField'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listPage, SN_batchDelete, SN_delete, SN_listExport } from '../../api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   components: {
@@ -149,18 +149,23 @@
     tableRowClassName: tableRowClassName,
     closeAdd() {
       this.isShowAdd = false
+      this.refresh()
     },
     addCategory() {
       this.isShowAdd = true
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      SN_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-      // 得到相关数据
+      this.loading = true
+      SN_listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
+        this.loading = false
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -168,44 +173,50 @@
         keyword: '',
         productCode: ''
       }
+      this.limit = 10
+      this.offset = 1
+      this.refresh()
     },
     exportToExcel() {
-      SN_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      SN_listExport(this.selectInfo).then(res => {
+        console.log()
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        let fileName = '设备sn码列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     },
     // 批量删除
     BatchDelete() {
       //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
+      const ids = this.$refs.multipleTable.selection.map(item => item.id)
       SN_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: '删除成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
       const id = row.id
       SN_delete({ id: id }).then(res => {
-        // console.log(res);
         // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: '删除成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     }
   }
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 8c0d4cd..58c8ca9 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -32,6 +32,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -43,8 +44,6 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="snCode" label="SN码（固定标识）" />
       <el-table-column prop="snQuantity" label="SN码（固定标识）个数" />
       <el-table-column prop="snIllustration" label="SN码（固定标识）说明" />
@@ -115,12 +114,14 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
+      this.loading = true
       S_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
       })
     },
     reset() {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index f573fd8..bed5935 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -21,7 +21,12 @@
             placeholder="请选择服务类型"
             style="width: 200px"
           >
-            <el-option v-for="item in options" :key="item.id" :label="item.typeName" :value="item.typeCode" />
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.typeName"
+              :value="item.typeCode"
+            />
           </el-select>
         </div>
       </div>
@@ -34,7 +39,14 @@
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -47,7 +59,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -64,6 +76,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -75,18 +88,10 @@
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -117,100 +122,141 @@
 
 <script>
 // 组件
-import ManagementAddDialog from '../../components/mycomponent/dialog/server/managementAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ManagementAddDialog from "../../components/mycomponent/dialog/server/managementAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { listPage, M_batchDelete, M_delete } from '../../api/server/Management'
-import { TM_list } from '../../api/server/TypeManagement'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { listPage, M_batchDelete, M_delete } from "../../api/server/Management";
+import { TM_list } from "../../api/server/TypeManagement";
 
 export default {
   components: {
     ManagementAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        serviceName: '',
-        typeCode: ''
+        serviceName: "",
+        typeCode: "",
       },
       options: [],
-      title: ''
-    }
+      title: "",
+      loading:false
+    };
   },
   mounted() {
-    TM_list().then(res => {
-      console.log(res)
-      this.options = res
-    })
+    TM_list().then((res) => {
+      console.log(res);
+      this.options = res;
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.title = '服务新增'
-      this.isShowAdd = true
-      this.rowInfo = ''
+      this.title = "服务新增";
+      this.isShowAdd = true;
+      this.rowInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+        id: "",
+      };
     },
     handleClick(row) {
-      this.title = '服务编辑'
-      this.isShowAdd = true
-      console.log(row)
-      this.rowInfo = row
+      this.title = "服务编辑";
+      this.isShowAdd = true;
+      console.log(row);
+      this.rowInfo = row;
+    },
+    reset() {
+      // 重置
+      this.selectInfo = {
+        serviceName: "",
+        typeCode: "",
+      };
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      M_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            M_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      M_delete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          M_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -252,7 +298,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/server/TypeManagement.vue b/src/views/server/TypeManagement.vue
index 4fe0cab..c13185a 100644
--- a/src/views/server/TypeManagement.vue
+++ b/src/views/server/TypeManagement.vue
@@ -5,21 +5,41 @@
       <div class="serveInput">
         服务类型名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.typeName" placeholder="请输入服务类型名称" clearable class="serve-input" />
+          <el-input
+            v-model="selectInfo.typeName"
+            placeholder="请输入服务类型名称"
+            clearable
+            class="serve-input"
+          />
         </div>
       </div>
       <div class="serveBtn">
         <!-- <el-button type="primary" class="btnItem">查询</el-button>
         <el-button type="success" class="btnItem bggreen" @click="addCategory">新增</el-button>
         <el-button type="danger" class="btnItem bgred">删除</el-button> -->
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
 
-        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
+        <el-button
+          type="success"
+          icon="el-icon-circle-plus-outline"
+          class="btnItem bggreen"
+          @click="addCategory"
+        >
           新增
         </el-button>
-        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
+        <el-button
+          type="danger"
+          icon="el-icon-delete-solid"
+          class="btnItem bgred"
+          @click="BatchDelete"
+        >
           删除
         </el-button>
       </div>
@@ -35,9 +55,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" :index="indexMethod" label="序号" width="55" />
+      <el-table-column
+        type="index"
+        :index="indexMethod"
+        label="序号"
+        width="55"
+      />
       <el-table-column prop="typeCode" label="服务类型编号" />
       <el-table-column prop="typeName" label="服务类型名称" />
       <el-table-column prop="description" label="描述" />
@@ -71,101 +97,148 @@
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog ></brand-add-dialog> -->
-    <typeAddDialog v-if="isShowAdd" :title="dialoaTitle" :data-info="dataInfo" @close="closeAdd" @refresh="refresh" />
+    <typeAddDialog
+      v-if="isShowAdd"
+      :title="dialoaTitle"
+      :data-info="dataInfo"
+      @close="closeAdd"
+      @refresh="refresh"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import typeAddDialog from '../../components/mycomponent/dialog/server/typeAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import typeAddDialog from "../../components/mycomponent/dialog/server/typeAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage, typeDelete, batchDelete } from '../../api/server/TypeManagement'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import {
+  listPage,
+  typeDelete,
+  batchDelete,
+} from "../../api/server/TypeManagement";
+export default {
+  // 加入分页逻辑
   components: {
-    typeAddDialog, GroupPage
+    typeAddDialog,
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       dataInfo: {},
       selectInfo: {
-        typeName: ''
+        typeName: "",
       },
-      dialoaTitle: '',
-      isShowAdd: false // 显示新增功能
-    }
+      dialoaTitle: "",
+      isShowAdd: false, // 显示新增功能
+      loading: false,
+    };
   },
   methods: {
     // 生成序号
     indexMethod(index) {
-      return index + 1
+      return index + 1;
     },
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addCategory() {
-      this.isShowAdd = true
-      this.dialoaTitle = '新增服务类型'
+      this.isShowAdd = true;
+      this.dialoaTitle = "新增服务类型";
+      this.dataInfo = {
+        typeCode: "", // 服务类型编号
+        typeName: "", // 服务类型名称
+        description: "", // 描述
+        remark: "", // 备注
+        qualifyIds: [""], // 资质要求
+      };
     },
     handleClick(row) {
-      console.log(row)
-      this.isShowAdd = true
-      this.dialoaTitle = '编辑'
-      this.dataInfo = row
+      console.log(row);
+      this.isShowAdd = true;
+      this.dialoaTitle = "编辑";
+      this.dataInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      this.loading = true;
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo)
+        .then((res) => {
+          console.log(res);
+          this.tableData = res;
+          this.loading = false;
+        })
+        .catch((err) => {
+          this.loading = false;
+        });
     },
     dealAry(scope) {
-      const ary = scope.row.qualifys.map(item => {
-        return item.qualifyName
-      })
-      let str = ''
+      const ary = scope.row.qualifys.map((item) => {
+        return item.qualifyName;
+      });
+      let str = "";
       for (let i = 0; i < ary.length; i++) {
-        str += ary[i]
+        str += ary[i];
       }
-      return str
+      return str;
     },
     Bdelete(row) {
-      const id = row.id
-      typeDelete({ id: id }).then(res => {
-        console.log(res)
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务类型吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          const id = row.id;
+          typeDelete({ id: id }).then((res) => {
+            console.log(res);
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
     },
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的服务类型吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              if (res != "") {
+                this.$message({
+                  message: "删除成功",
+                  type: "success",
+                });
+                this.refresh();
+              }
+            });
           })
-          this.refresh()
-        }
-      })
-    }
-  }
-}
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务类型",
+          type: "error",
+        });
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/product/product.js b/src/api/product/product.js
index e4b9db1..beda1b5 100644
--- a/src/api/product/product.js
+++ b/src/api/product/product.js
@@ -29,5 +29,13 @@
 const productDetail = (data) => {
   return instance.post('/productInfo/detail', data)
 }
+// 绑定服务.
+const bindServ = (data)=>{
+  return instance.post('/productInfo/service/bind', data)
+}
+// 查询绑定列表
+const listBindService = (data)=>{
+  return instance.post('productInfo/service/bindList', data)
+}
 
-export { listPage, add, update, productDelete, batchDelete, list, productDetail }
+export { listPage, add, update, productDelete, batchDelete, list, productDetail, bindServ, listBindService }
diff --git a/src/api/product/snCodeField.js b/src/api/product/snCodeField.js
index 2d006a9..1f31976 100644
--- a/src/api/product/snCodeField.js
+++ b/src/api/product/snCodeField.js
@@ -19,7 +19,7 @@
 
 // 导出
 const SN_listExport = (data) => {
-  return instance.post(`snInfo/listExport`, data)
+  return instance.post(`snInfo/listExport`, data, { responseType: 'blob' })
 }
 
 export { SN_listExport, SN_batchDelete, SN_listPage, SN_delete, SN_add }
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/api/server/operation.js b/src/api/server/operation.js
index 25eb67a..404b354 100644
--- a/src/api/server/operation.js
+++ b/src/api/server/operation.js
@@ -1 +1,31 @@
 import { instance } from '../request/http'
+// 暂时无接口
+// 列表
+const listPage = (str, data) => {
+  return instance.post(`/serviceInfo/listPage?${str}`, data)
+}
+// 服务不分页
+const O_list = () => {
+  return instance.post(`/serviceInfo/list`, {})
+}
+const O_add = (data) => {
+  return instance.post('/serviceInfo/add', data)
+}
+// 更新
+const O_update = (data) => {
+  return instance.post('/serviceInfo/update', data)
+}
+// 删除
+const O_delete = (data) => {
+  return instance.post('/serviceInfo/delete', data)
+}
+//  批量删除
+const O_batchDelete = (data) => {
+  return instance.post('/serviceInfo/batchDelete', data)
+}
+
+export {
+  O_update,
+  O_batchDelete, O_delete, O_add, listPage
+  , O_list
+}
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index 6a0fd56..a68977e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -89,29 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
-          this.deviceList = [
-            {
-              deviceName: "燃气灶",
-              lat: "39.97",
-              lon: "116.3",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.93",
-              lon: "116.15",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.8",
-              lon: "116.22",
-            },
-            {
-              deviceName: "燃气灶",
-              lat: "39.74",
-              lon: "116.33",
-            },
-          ];
+          this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          // this.deviceList = [
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.97",
+          //     lon: "116.3",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.93",
+          //     lon: "116.15",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.8",
+          //     lon: "116.22",
+          //   },
+          //   {
+          //     deviceName: "燃气灶",
+          //     lat: "39.74",
+          //     lon: "116.33",
+          //   },
+          // ];
           // 初始化地图
           this.initMap();
         })
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c47e73c..d06f821 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -200,7 +200,6 @@
     },
     save() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deptForm)
         if (valid) {
           if (this.title === '品类新增') {
             C_add(this.categoryInfo).then(res => {
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 1ca24ff..30149bc 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -4,159 +4,416 @@
     <div class="deviceDialog ">
       <div class="headInfo">
         <div class="inputContent">
-          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" />
-          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.brandCode" title="设备型号" width="200px" :disabled="true" readable/>
+          <input-vue v-model="rowInfo.deviceName" title="设备名称" width="200px" :disabled="true" readable />
+          <input-vue v-model="rowInfo.snCode" title="SN码" width="200px" :disabled="true" readable />
         </div>
         <div class="inputContent">
-          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" />
+          <input-vue v-model="rowInfo.deviceStatus" title=" 设备状态" width="200px" :disabled="true" readable />
           <input-vue
             v-model="rowInfo.deviceAddress"
             :disabled="true"
             title=" 设备位置"
             width="552px"
             style="flex: 1; margin-left: 63px"
+            readable
           />
         </div>
       </div>
       <div class="content">
-        <div class="content_nav">
-          <div class="nav_item" :class="{ selectNav: navSelect == 0 }" @click="changeNav(0)">
-            基本信息
-          </div>
-          <div class="nav_item" :class="{ selectNav: navSelect == 1 }" @click="changeNav(1)">
-            设备信息
-          </div>
-          <div v-if="rowInfo.businessExt" class="nav_item" :class="{ selectNav: navSelect == 2 }" @click="changeNav(2)">
-            数据信息
-          </div>
-        </div>
+        <el-tabs v-model="navSelect" type="card" @tab-click="handleClick" style="margin-top:20px">
+          <el-tab-pane label="基本信息" name="0">
+            <div class="content_content baseInfo">
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.brandName"
+                  title="设备品牌"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.createTime"
+                  title="生产日期"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceMac"
+                  title="Mac地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.productCode"
+                  title="产品品类"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
+                <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceHardwareVersion"
+                  title="硬件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceName"
+                  title="设备名称"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <input-vue
+                  v-model="rowInfo.deviceIp"
+                  title="IP地址"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.deviceStatus"
+                  title="产品状态"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+              </div>
+              <div class="inputContent">
+                <input-vue
+                  v-model="rowInfo.deviceSoftwareVersion"
+                  title="软件版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
+                <div style="height: 40px;" />
+                <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                <input-vue
+                  v-model="rowInfo.serialVersionUID"
+                  title="产品版本"
+                  width="200px"
+                  style="justify-content: space-between;"
+                  :disabled="true"
+                  readable
+                />
+                <div style="height: 40px;" />
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="设备信息" name="1">
+            <div class="content_content">
+              <div class="deviceInfo">
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActive"
+                    title="是否激活"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <input-vue
+                    v-model="rowInfo.deviceBindUser"
+                    title="是否绑定用户"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.deviceActiveTime"
+                    title="激活时间"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+                <div class="inputContent">
+                  <input-vue
+                    v-model="rowInfo.createTime"
+                    title="用户名称"
+                    width="200px"
+                    style="justify-content: space-between;"
+                    :disabled="true"
+                    readable
+                  />
+                  <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane v-if="rowInfo.businessExt" label="数据信息" name="2">
+            <div class="content_content">
+              <div>
+                <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiStatus"
+                      title="wifi状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="开关机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.wifiName"
+                      title="wifi名称"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.oilPouringReminder"
+                      title="倒油提醒开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '热水器' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.currentTemperature"
+                      title="当前温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.switchStatus"
+                      title="零冷水开关"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workMode"
+                      title="当前模式"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '燃气灶' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.leftWorkStatus"
+                      title="左灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.smokeStove"
+                      title="烟灶联动"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.rightWorkStatus"
+                      title="右灶工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.runTime"
+                      title="运行时长"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
+                  </div>
+                </div>
+                <div v-if="rowInfo.deviceName == '壁挂炉' " class="deviceInfo">
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.workStatus"
+                      title="工作状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingStatus"
+                      title="供暖"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomTemp"
+                      title="卫浴温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.heatingTemp"
+                      title="供暖温度"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.bathroomStatus"
+                      title="卫浴状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.waterPumpStatus"
+                      title="水泵状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                  <div class="inputContent">
+                    <input-vue
+                      v-model="rowInfo.businessExt.antifreezeStatus"
+                      title="防冻状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                    <input-vue
+                      v-model="rowInfo.businessExt.fanStatus"
+                      title="风机状态"
+                      width="200px"
+                      style="justify-content: space-between;"
+                      :disabled="true"
+                      readable
+                    />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+
         <div class="content_content">
           <div v-if="navSelect == 0" class="baseInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.brandName"
-                title="设备品牌"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="生产日期"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceMac"
-                title="Mac地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.productCode"
-                title="产品品类"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品重量" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue>
-              <input-vue title="产品材质" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceHardwareVersion"
-                title="硬件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceName"
-                title="设备名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceIp"
-                title="IP地址"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="国际69码" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.deviceStatus"
-                title="产品状态"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="产品颜色" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceSoftwareVersion"
-                title="软件版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="供应商" width="200px" style="justify-content: space-between;"  v-model="rowInfo.brandCode"   :disabled="true"></input-vue> -->
-              <div style="height: 40px;" />
-              <!-- <input-vue title="产品尺寸" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-              <input-vue
-                v-model="rowInfo.serialVersionUID"
-                title="产品版本"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <div style="height: 40px;" />
-            </div>
+
           </div>
-          <div v-if="navSelect == 1" class="deviceInfo">
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActive"
-                title="是否激活"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <input-vue
-                v-model="rowInfo.deviceBindUser"
-                title="是否绑定用户"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户手机号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.deviceActiveTime"
-                title="激活时间"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="用户账号" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-            <div class="inputContent">
-              <input-vue
-                v-model="rowInfo.createTime"
-                title="用户名称"
-                width="200px"
-                style="justify-content: space-between;"
-                :disabled="true"
-              />
-              <!-- <input-vue title="绑定时间" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
-            </div>
-          </div>
+
           <div v-if="navSelect == 2 ">
             <div v-if="rowInfo.deviceName == '油烟机' " class="deviceInfo">
               <div class="inputContent">
@@ -166,6 +423,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.wifiStatus"
@@ -173,6 +431,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -180,6 +439,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -196,6 +456,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -205,6 +466,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.oilPouringReminder"
@@ -212,6 +474,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -223,6 +486,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.currentTemperature"
@@ -230,6 +494,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.switchStatus"
@@ -237,6 +502,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -246,6 +512,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="进水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -256,6 +523,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -268,6 +536,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.leftWorkStatus"
@@ -275,6 +544,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -284,6 +554,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.rightWorkStatus"
@@ -300,6 +571,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <!-- <input-vue title="出水温度" width="200px" style="justify-content: space-between;" v-model="rowInfo.brandCode" :disabled="true"></input-vue> -->
               </div>
@@ -312,6 +584,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.heatingStatus"
@@ -319,6 +592,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomTemp"
@@ -326,6 +600,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -335,6 +610,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.bathroomStatus"
@@ -342,6 +618,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.waterPumpStatus"
@@ -349,6 +626,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
               <div class="inputContent">
@@ -358,6 +636,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
                 <input-vue
                   v-model="rowInfo.businessExt.fanStatus"
@@ -365,6 +644,7 @@
                   width="200px"
                   style="justify-content: space-between;"
                   :disabled="true"
+                  readable
                 />
               </div>
             </div>
@@ -392,7 +672,7 @@
   },
   data() {
     return {
-      navSelect: 0, // 0 1 2 为导航栏的选项
+      navSelect: '0', // 0 1 2 为导航栏的选项
       rowInfo: {}
     }
   },
@@ -480,6 +760,7 @@
 }
 
 .content_content {
+  padding: 0px 10px;
   // padding: 20px 0 60px 0;
   // box-sizing: border-box;
 
diff --git a/src/components/mycomponent/dialog/productBindDialog.vue b/src/components/mycomponent/dialog/productBindDialog.vue
index 0ce020b..d387996 100644
--- a/src/components/mycomponent/dialog/productBindDialog.vue
+++ b/src/components/mycomponent/dialog/productBindDialog.vue
@@ -17,16 +17,16 @@
           添加服务
         </el-button>
       </div>
-      <el-table ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
-        <el-table-column type="index" label="序号" width="60px" />
+      <el-table v-loading="loading" ref="tb" :data="tableData" border class="el-tab" style="width: 100%;">
+        <el-table-column type="index" label="#" width="60px" />
         <el-table-column prop="serviceCode" label="服务编号">
           <template slot-scope="{row,$index}">
-            <el-select v-model="brandName" clearable placeholder="请选择">
+            <el-select v-model="row.id" clearable placeholder="请选择" @change="val=>changeService(val,$index)">
               <el-option
                 v-for="item in serviceList"
-                :key="item.brandCode"
-                :label="item.brandName"
-                :value="item.brandName"
+                :key="item.id"
+                :label="item.serviceCode"
+                :value="item.id"
               />
             </el-select>
           </template>
@@ -38,7 +38,7 @@
       </el-table>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
+      <el-button type="primary" class="save" @click="bindService">
         保存
       </el-button>
       <el-button type="info" class="close" @click="close">
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { M_list } from '../../../api/server/Management'
-
+import { M_list } from '@/api/server/Management'
+import { bindServ, listBindService } from '@/api/product/product'
 export default {
   props: {
     dataInfo: {
@@ -60,29 +60,67 @@
   },
   data() {
     return {
+      loading: ture,
       tableData: [],
-      isShowInfo: true,
+      isShowInfo: false,
       serviceList: [],
-      brandName: ''
+      serviceId: ''
     }
   },
   mounted() {
     M_list().then(res => {
-      console.log(res)
+      this.serviceList = res
     })
   },
   methods: {
     close() {
       this.$emit('close')
     },
+    initDialog(row){
+      this.isShowInfo = true
+      if(this.dataInfo){
+        this.fetchBindList(row.id)
+      }
+    },
+    fetchBindList(id){
+      this.loading = true
+      listBindService({id:id}).then(res=>{
+        this.tableData = res
+        this.loading = false
+      })
+    },
     bindServeClick() {
-      const obj = {}
-      obj.serviceCode = '',
-      obj.typeCode = '',
-      obj.description = '',
-      obj.serviceTime = '',
-      obj.remark = ''
+      const obj = {
+        id:'',
+        serviceCode: '',
+        serviceName: '',
+        typeCode: '',
+        description: '',
+        serviceTime: '',
+        remark: ''
+      }
       this.tableData.push(obj)
+    },
+    changeService(val, index){
+      const service = this.serviceList.filter(item=>item.id==val)[0]
+      this.tableData[index].id = service.id
+      this.tableData[index].serviceCode = service.serviceCode
+      this.tableData[index].serviceName = service.serviceName
+      this.tableData[index].typeCode = service.typeCode
+      this.tableData[index].description = service.description
+      this.tableData[index].serviceTime = service.serviceTime
+      this.tableData[index].remark = service.remark
+    },
+    bindService(){
+      for(const item of this.tableData){
+        const data = {
+          serviceId: item.id,
+          productId: this.dataInfo.id
+        }
+        bindServ(data).then(res=>{
+          // this.$message.success('绑定成功')
+        })
+      }
     }
   }
 }
diff --git a/src/components/mycomponent/dialog/server/managementAddDialog.vue b/src/components/mycomponent/dialog/server/managementAddDialog.vue
index cdec684..d3c1b9d 100644
--- a/src/components/mycomponent/dialog/server/managementAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/managementAddDialog.vue
@@ -122,54 +122,51 @@
         </div>
       </div>
       <div class="btnBox">
-        <el-button type="primary" class="save" @click="save">
-          保存
-        </el-button>
-        <el-button type="info" class="close" @click="close">
-          取消
-        </el-button>
+        <el-button type="primary" class="save" @click="save"> 保存 </el-button>
+        <el-button type="info" class="close" @click="close"> 取消 </el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import InputVue from '../../input/inputVue.vue'
-import DialogHeader from '../dialogHeader.vue'
-import RedStar from '../../redStar.vue'
-import { TM_list } from '../../../../api/server/TypeManagement'
-import { M_add, M_update } from '../../../../api/server/Management'
+import InputVue from "../../input/inputVue.vue";
+import DialogHeader from "../dialogHeader.vue";
+import RedStar from "../../redStar.vue";
+import { TM_list } from "../../../../api/server/TypeManagement";
+import { M_add, M_update } from "../../../../api/server/Management";
 export default {
   components: {
     DialogHeader,
     RedStar,
-    InputVue
+    InputVue,
   },
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: true,
     },
-    title: '',
-    dataInfo: ''
+    title: "",
+    dataInfo: "",
   },
   data() {
     return {
       serverType: [],
       managementInfo: {
-        serviceCode: '',
-        serviceName: '',
-        typeCode: '',
-        description: '',
-        serviceTime: '',
-        remark: ''
-      }
-    }
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      },
+    };
   },
   watch: {
     dataInfo: {
       handler(vls) {
-        if (!vls.id) return
+        console.log(vls, "newval");
+        if (!vls.id) return;
         this.managementInfo = {
           id: vls.id,
           serviceCode: vls.serviceCode,
@@ -177,51 +174,66 @@
           typeCode: vls.typeCode,
           description: vls.description,
           serviceTime: vls.serviceTime,
-          remark: vls.remark
-        }
+          remark: vls.remark,
+        };
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     TM_list().then((res) => {
-      console.log(res)
-      this.serverType = res
-    })
+      console.log(res);
+      this.serverType = res;
+    });
   },
   methods: {
     close() {
-      this.$emit('close')
+      this.$emit("close");
+      this.managementInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+      };
     },
     save() {
-      if (this.title == '服务新增') {
+      if (this.valiate()) {
+        if (this.title === "服务新增") {
         M_add(this.managementInfo).then((res) => {
-          if (res != 0) {
-            this.$message.success('新增成功')
-            this.close()
+            this.$message.success("新增成功");
+            this.close();
             this.managementInfo = {
-              serviceCode: '',
-              serviceName: '',
-              typeCode: '',
-              description: '',
-              serviceTime: '',
-              remark: ''
-            }
-          }
-        })
+              serviceCode: "",
+              serviceName: "",
+              typeCode: "",
+              description: "",
+              serviceTime: "",
+              remark: "",
+            };
+        });
       } else {
         // 编辑操作
-        M_update(this.managementInfo).then(res => {
-          if (res != '') {
-            this.$message.success('跟新成功')
-            this.close()
-          }
-        })
+        M_update(this.managementInfo).then((res) => {
+            this.$message.success("更新成功");
+            this.close();
+        });
+      }
+      }
+    },
+    valiate() {
+      const { managementInfo: { serviceCode, serviceName, typeCode, description,serviceTime } } = this
+      if(serviceCode && serviceName && typeCode && description && serviceTime) {
+        return true
+      } else {
+        this.$message.error("请先填写完整信息");
+        return false
       }
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/mycomponent/dialog/server/operationAddDialog.vue b/src/components/mycomponent/dialog/server/operationAddDialog.vue
index dfefe42..d436541 100644
--- a/src/components/mycomponent/dialog/server/operationAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/operationAddDialog.vue
@@ -11,13 +11,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.date"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务名称" placeholder="请输入品牌名称" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务名称" placeholder="请输入品牌名称" v-model="form.name" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.date"
               style="width:300PX"
               filterable
               multiple
@@ -42,13 +43,14 @@
             width="300px"
             class="inputWidth"
             style="justify-content: space-between;"
+            v-model="form.address"
           />
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="服务优惠" placeholder="" class="inputWidth" style="justify-content: space-between;">
+          <input-vue title="服务优惠" v-model="form.address1" placeholder="" class="inputWidth" style="justify-content: space-between;">
             <el-select
-              v-model="value"
+              v-model="form.address"
               style="width:300px"
               filterable
               multiple
@@ -67,7 +69,7 @@
         </div>
         <div class="inputBox">
           <red-star />
-          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" />
+          <input-vue title="时间" width="300px" class="inputWidth" style="justify-content: space-between;" v-model='form.address2'/>
         </div>
 
         <div class="inputBox">
@@ -100,16 +102,37 @@
     RedStar,
     InputVue
   },
+  data(){
+    return{
+      form:{
+        date:'', // 服务运营编号
+        name:'', // 服务名称
+        address:'', // 收费
+        address1:'', // 优惠
+        address2:'', // 日期
+        mark:'', // 备注
+      }
+    }
+  },
   props: {
     isShowInfo: {
       type: Boolean,
       default: true
-    }
+    },
   },
   methods: {
     close() {
       this.$emit('close')
-    }
+    },
+    init(detail){
+      if(detail.name){
+           this.form.address = detail.address
+           this.form.address1 = detail.address1
+           this.form.address2 = detail.address2
+           this.form.date = detail.date
+           this.form.name = detail.name
+      }
+    },
   }
 }
 </script>
diff --git a/src/components/mycomponent/dialog/server/typeAddDialog.vue b/src/components/mycomponent/dialog/server/typeAddDialog.vue
index 4b51a55..6c98c04 100644
--- a/src/components/mycomponent/dialog/server/typeAddDialog.vue
+++ b/src/components/mycomponent/dialog/server/typeAddDialog.vue
@@ -103,24 +103,25 @@
         typeName: '', // 服务类型名称
         description: '', // 描述
         remark: '', // 备注
-        qualifyIds: ''// 资质要求
+        qualifyIds: '', // 资质要求
+        id:''
       }
     }
   },
   watch: {
     dataInfo: {
       handler(vla) {
+        console.log(vla, 'newVal')
         this.isShowInfo = true
-        console.log(vla.qualifys[0].qualifyName, this.isShowInfo, '======')
         if (vla != '') {
           this.addInfo = {
             typeCode: vla.typeCode,
             typeName: vla.typeName,
             description: vla.description,
             remark: vla.remark,
-            qualifyIds: [vla.qualifys[0].qualifyName]
+            qualifyIds: vla.qualifys.map(item => item.qualifyId),
+            id:vla.id
           }
-          console.log(this.addInfo)
         }
       },
       deep: true,
@@ -149,28 +150,22 @@
     save() {
       console.log(123)
       if (this.title == '新增服务类型') {
-        console.log(1, '----------')
         if (this.addInfo.typeCode != '' && this.addInfo.typeName != '' && this.addInfo.description != '' && this.addInfo.qualifyIds != '') {
-          console.log(2, '----------')
           add(this.addInfo).then(res => {
-            if (!res.code) {
               this.close()
               this.$emit('refresh')
               Message.success('保存成功')
-            }
           })
         } else {
-          Message.error('请输入完整')
+          Message.error('请先输入完整信息')
         }
       } else {
-        console.log('3')
         // 更新
         update(this.addInfo).then(res => {
-          if (!res.code) {
+          console.log(res, 'updatecode')
             this.close()
             this.$emit('refresh')
             Message.success('更新成功')
-          }
         })
       }
     },
diff --git a/src/components/mycomponent/dialog/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..68808ff 100644
--- a/src/components/mycomponent/dialog/snCodeFieldDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
@@ -11,24 +11,31 @@
       <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="160px">
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(固定标识)" prop="snFixedCode">
+            <el-form-item label="SN码(固定标识)" prop="snFixedId">
               <el-select
-                v-model="addInfo.snFixedCode"
+                v-model="addInfo.snFixedId"
                 filterable
                 style="width: 100%"
                 @change="snFixedIdChange"
-              />
+              >
+                <el-option
+                  v-for="(item,index) in snCodeList"
+                  :key="index"
+                  :label="item.snCode"
+                  :value="item.id"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="SN码固定标识名字" prop="snFixedCode">
-              <el-input v-model.trim="addInfo.productCode" type="text" placeholder="根据标识自动生成的说明" />
+            <el-form-item label="SN码固定标识名字" prop="snFixedIllustration">
+              <el-input v-model.trim="addInfo.snFixedIllustration" type="text" placeholder="根据标识自动生成的说明" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="SN码(起始序列号)" prop="snFixedCode">
+            <el-form-item label="SN码(起始序列号)" prop="snStartCode">
               <el-input v-model.trim="addInfo.snStartCode" type="text" placeholder="请输入起始编码" />
             </el-form-item>
           </el-col>
@@ -97,30 +104,25 @@
         </el-row>
       </el-form>
     </div>
-
-    <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
-      <el-button type="info" class="close" @click="close">
-        取消
-      </el-button>
-    </div>
+    <div slot="footer" class="dialog-footer">
+      <div class="btnBox">
+        <el-button type="primary" class="save" @click="save">
+          保存
+        </el-button>
+        <el-button type="info" class="close" @click="close">
+          取消
+        </el-button>
+      </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
-// import InputVue from "../../input/inputVue.vue";
-import dialogHeader from '../dialog/dialogHeader.vue'
-import RedStar from '../redStar.vue'
-import InputVue from '../input/inputVue.vue'
 import { S_list } from '../../../api/product/snCodeRuls'
 import { list } from '../../../api/product/product'
 import { SelectList } from '../../../api/product/brand'
 import { SN_add } from '../../../api/product/snCodeField'
 export default {
-  components: { dialogHeader, RedStar, InputVue },
   props: {
     isShowAdd: {
       type: Boolean,
@@ -138,7 +140,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -150,6 +152,19 @@
         productDate: '',
         coreParts: '',
         remark: ''
+      },
+      rules: {
+        snFixedId: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snFixedIllustration: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snStartCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        snEndCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productCode: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productParams: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productBrandName: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        hardwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        softwareVersion: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        productDate: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }],
+        coreParts: [{ required: true, message: '此项不能为空', trigger: ['blur', 'change'] }]
       }
     }
   },
@@ -189,13 +204,20 @@
       })
     },
     save() {
-      const temp = { ...this.addInfo }
-      temp.snSegmentNum = this.snSegmentNum
-      SN_add(temp).then(res => {
-        if (res != '') {
-          this.$message.success('添加成功')
-          this.close()
-          this.reset()
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          const temp = { ...this.addInfo }
+          temp.snSegmentNum = this.snSegmentNum
+          SN_add(temp).then(res => {
+            if (res != '') {
+              this.$message.success('添加成功')
+              this.close()
+              this.reset()
+              this.$nextTick(() => {
+                this.$refs['dataForm'].clearValidate()
+              })
+            }
+          })
         }
       })
     },
@@ -208,7 +230,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +246,20 @@
     },
     snFixedIdChange() {
       const index = this.snCodeList.findIndex(item => {
-        return item.snCode == this.addInfo.snFixedCode
+        return item.id == this.addInfo.snFixedId
       })
       console.log(this.snCodeList[index].snCode, index)
-      this.addInfo.snFixedId = this.snCodeList[index].id
+      this.addInfo.snFixedCode = this.snCodeList[index].snCode
       this.addInfo.snFixedIllustration = this.snCodeList[index].snIllustration
     },
     productChange() {
       const index = this.productList.findIndex(item => {
         return item.productCode == this.addInfo.productCode
       })
-
+      this.addInfo.productId = this.productList[index].id
       this.addInfo.productName = this.productList[index].productName
-      //    this.addInfo.productBrandCode =this.snCodeList[index].brandId
-      // this.addInfo.productBrandName = this.snCodeList[index].brandName
+      this.addInfo.productBrandCode = this.productList[index].brandCode
+      this.addInfo.productBrandName = this.productList[index].brandName
     },
     brandCodeChange() {
       const index = this.brandList.findIndex(item => {
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 1124d96..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,114 +1,48 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.index }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">硬件版本</div>
-          <div class="content"> {{ dataInfo.hardwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备品牌码</div>
-          <div class="content"> {{ dataInfo.productBrandCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备品牌名称</div>
-          <div class="content"> {{ dataInfo.productBrandName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">productCode</div>
-          <div class="content"> {{ dataInfo.productCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">productDate</div>
-          <div class="content"> {{ dataInfo.productDate }}</div>
-        </div>
-        <div class="item">
-          <div class="title">设备id</div>
-          <div class="content"> {{ dataInfo.productId }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">设备名称</div>
-          <div class="content"> {{ dataInfo.productName }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN起始序列码</div>
-          <div class="content"> {{ dataInfo.snStartCode }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN终止序列码</div>
-          <div class="content"> {{ dataInfo.snEndCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">软件版本</div>
-          <div class="content"> {{ dataInfo.softwareVersion }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedCode</div>
-          <div class="content"> {{ dataInfo.snFixedCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">snFixedId</div>
-          <div class="content"> {{ dataInfo.snFixedId }}</div>
-        </div>
-        <div class="item">
-          <div class="title">snFixedIllustration</div>
-          <div class="content"> {{ dataInfo.snFixedIllustration }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">段码个数</div>
-          <div class="content"> {{ dataInfo.snSegmentNum }}</div>
-        </div>
-        <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snFixedCode ? dataInfo.snFixedCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码固定标识名字">
+          {{ dataInfo.snFixedIllustration ? dataInfo.snFixedIllustration : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(起始序列号)">
+          {{ dataInfo.snStartCode ? dataInfo.snStartCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码(终止序列号)">
+          {{ dataInfo.snEndCode ? dataInfo.snEndCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备型号">
+          {{ dataInfo.productCode ? dataInfo.productCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备品牌">
+          {{ dataInfo.productBrandName ? dataInfo.productBrandName : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="硬件版本">
+          {{ dataInfo.hardwareVersion ? dataInfo.hardwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="软件版本">
+          {{ dataInfo.softwareVersion ? dataInfo.softwareVersion : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="生产日期">
+          {{ dataInfo.productDate ? dataInfo.productDate : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="核心配件">
+          {{ dataInfo.coreParts ? dataInfo.coreParts : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ dataInfo.remark ? dataInfo.remark : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/components/mycomponent/input/inputVue.vue b/src/components/mycomponent/input/inputVue.vue
index 8a50163..1c0cba5 100644
--- a/src/components/mycomponent/input/inputVue.vue
+++ b/src/components/mycomponent/input/inputVue.vue
@@ -7,7 +7,7 @@
     </div>
     <!--可以自定义 输入框  -->
     <slot>
-      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
+      <el-input v-model="vls" :placeholder="placeholder" :size="size" :style="{width:width}" :class="{'readinput':readable}" clearable :disabled="disabled" @input="changeinput" @blur="blurInput" />
     </slot>
   </div>
 </template>
@@ -23,6 +23,10 @@
     event: 'changeinput'
   },
   props: {
+    readable: {
+      type: Boolean,
+      default: false
+    },
     redStar: false,
     title: '',
     width: '',
@@ -71,4 +75,16 @@
   min-width: 68.45px;
   margin-right: 10px
 }
+  .readinput{
+
+  }
+</style>
+<style>
+  .readinput.is-disabled .el-input__inner {
+      background-color: #fff !important;
+      border-color: #E4E7ED;
+      color: #303133;
+      cursor: not-allowed;
+    }
+
 </style>
diff --git a/src/utils/myUtils/mixins/infoDialog.js b/src/utils/myUtils/mixins/infoDialog.js
index 4c492f3..ac6af5b 100644
--- a/src/utils/myUtils/mixins/infoDialog.js
+++ b/src/utils/myUtils/mixins/infoDialog.js
@@ -2,7 +2,7 @@
   props: {
     isShowInfo: {
       type: Boolean,
-      default: true
+      default: false
     },
     // title: '',
     dataInfo: {
diff --git a/src/utils/myUtils/mixins/listPage.js b/src/utils/myUtils/mixins/listPage.js
index 07f3141..9b8c399 100644
--- a/src/utils/myUtils/mixins/listPage.js
+++ b/src/utils/myUtils/mixins/listPage.js
@@ -1,6 +1,7 @@
 const listMixin = {
   data() {
     return {
+      loading: false,
       tableData: { rows: [] }, // 品牌表格数据
       limit: 10, // 当前的行数
       offset: 1, // 当前页
@@ -24,7 +25,7 @@
     selectData() {
       this.queryInfo = { ...this.selectInfo } // 加入搜索内容
       // 回到初始页
-      if (this.offset == 1) {
+      if (this.offset === 1) {
         this.refresh()
         return
       }
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index bddce18..4398baa 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -13,7 +13,7 @@
         </div>
         预计工期
         <div class="inputBox" style="width: 300px">
-          <el-date-picker v-model="selectInfo.itemDuration" type="date" placeholder="请选择日期" class="product-input" />
+          <el-date-picker v-model="selectInfo.itemDuration" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" class="product-input" />
         </div>
       </div>
       <div class="productBtn">
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 33c1a3d..d833399 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -316,12 +316,12 @@
             </el-table-column>
           </el-table>
         </div>
-        <div>
+      </div>
+      <div>
           <el-button class="table-btn" @click="handleAddBtn">
             添加项目需求
           </el-button>
         </div>
-      </div>
     </div>
     <div class="btnBox">
       <el-button type="primary" class="save" @click="save">
@@ -421,22 +421,27 @@
   },
   methods: {
     save() {
-      this.addInfo.productList = {
+      if(this.valiateForm()){
+        this.addInfo.productList = {
         productCode: this.addInfo.productList.productCode,
         productQuantity: this.addInfo.productList.productQuantity,
         productPrice: this.addInfo.productList.productPrice,
         productName: ''
       }
       add(this.addInfo).then(res => {
-        console.log(res)
-        if (res) {
+        this.setData()
           this.$message({
             message: '保存成功',
             type: 'success'
           })
-        }
-      })
-      this.setData()
+      }) 
+      } else {
+        this.$message({
+            message: '请先完整填写报备信息',
+            type: 'error'
+          })
+      }
+      
     },
     close() {
       this.setData()
@@ -462,7 +467,6 @@
         this.form.countyList = res
       })
     },
-
     handleAddBtn() {
       const obj = {}
       obj.brandName = ''
@@ -525,6 +529,12 @@
           this.$set(this.showEdit, index, false) // vue添加属性的方法
         }
       })
+      row.productCode = this.addInfo.productList.productCode
+      row.brandName = this.brandName
+      console.log(this.categoryIds)
+      row.categoryIds = this.categoryIds
+      row.productQuantity = this.addInfo.productList.productQuantity
+      row.productPrice = this.addInfo.productList.productPrice
     },
     setData() {
       this.addInfo = {
@@ -553,6 +563,17 @@
         agentPhone: '',
         productList: []
       }
+    },
+    valiateForm() {
+      let arr = []
+      for(var item in this.addInfo) {
+        if(this.addInfo[item]){
+          arr.push(1)
+        }else{
+          arr.push(0)
+        }
+      }
+      return arr.every(item => item === 1)
     }
   }
 }
@@ -568,7 +589,7 @@
 
   .report-from {
     .from-title {
-      font-size: 22px;
+      font-size: 16px;
       font-weight: bold;
       background-color: #28739e;
       color: white;
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 4f061c8..2964d08 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -68,12 +68,11 @@
       <!-- <div>页码</div> -->
     </div>
     <!-- 新增弹框 -->
-
-    <!--    <brand-add-dialog-->
-    <!--      :isShowInfo="isShowAdd"-->
-    <!--      @close="closeAdd"-->
-    <!--    >-->
-    <!--    </brand-add-dialog>-->
+       <brand-add-dialog
+         :isShowInfo="isShowAdd"
+         @close="closeAdd"
+       >
+       </brand-add-dialog>
   </div>
 </template>
 
@@ -103,21 +102,6 @@
           address3: '0.5',
           address4: '每天必做'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
@@ -125,7 +109,8 @@
           label: '黄金糕'
         }
       ],
-      value: ''
+      value: '',
+      input:''
     }
   },
   methods: {
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 1b06442..af68692 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -129,21 +129,6 @@
           address4: '100元',
           address5: '是'
         }
-        // {
-        //   date: '2016-05-04',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1517 弄'
-        // },
-        // {
-        //   date: '2016-05-01',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1519 弄'
-        // },
-        // {
-        //   date: '2016-05-03',
-        //   name: '王小虎',
-        //   address: '上海市普陀区金沙江路 1516 弄'
-        // }
       ],
       options: [
         {
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index 1874202..36c7c50 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -2,30 +2,52 @@
 <template>
   <div class="order-container">
     <div class="order-from">
-      <div class="order-title">
-        下订单
-      </div>
+      <div class="order-title">下订单</div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userName" title="下单人" placeholder="请输入下单人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userName"
+            title="下单人"
+            placeholder="请输入下单人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.userPhone" title="联系方式" placeholder="请输入联系方式" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.userPhone"
+            title="联系方式"
+            placeholder="请输入联系方式"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
           <inputVue title="签订日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.signDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.signDate"
+              type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
         <div class="input-item">
           <RedStar />
           <inputVue title="交付日期" class="inputWidth">
-            <el-date-picker v-model="addInfo.deliveryDate" type="date" placeholder="选择日期" style="width: 380px" />
+            <el-date-picker
+              v-model="addInfo.deliveryDate"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              placeholder="选择日期"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
@@ -40,7 +62,12 @@
               style="width: 150px; margin-left: 55px"
               @change="provinceChange($event)"
             >
-              <el-option v-for="item in form.provinceList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.provinceList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
@@ -51,21 +78,47 @@
               style="width: 150px"
               @change="cityChange($event)"
             >
-              <el-option v-for="item in form.cityList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option
+                v-for="item in form.cityList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
           <inputVue title="" class="inputWidth">
-            <el-select v-model="addInfo.deliveryArea" clearable placeholder="县/街道" style="width: 150px">
-              <el-option v-for="item in form.countyList" :key="item.id" :label="item.name" :value="item.id" />
+            <el-select
+              v-model="addInfo.deliveryArea"
+              clearable
+              placeholder="县/街道"
+              style="width: 150px"
+            >
+              <el-option
+                v-for="item in form.countyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
             </el-select>
           </inputVue>
-          <inputVue v-model="addInfo.deliveryAddress" placeholder="请输入详细地址" class="inputWidth" width="440px" />
+          <inputVue
+            v-model="addInfo.deliveryAddress"
+            placeholder="请输入详细地址"
+            class="inputWidth"
+            width="440px"
+          />
         </div>
       </div>
       <div class="order-inputBox">
         <div class="input-item">
           <RedStar />
-          <inputVue v-model="addInfo.receiver" title="收货人" placeholder="请输入收货人姓名" class="inputWidth" width="380px" />
+          <inputVue
+            v-model="addInfo.receiver"
+            title="收货人"
+            placeholder="请输入收货人姓名"
+            class="inputWidth"
+            width="380px"
+          />
         </div>
         <div class="input-item">
           <RedStar />
@@ -81,16 +134,20 @@
       <div class="order-inputBox">
         <div class="input-item">
           <inputVue title="备注" class="inputWidth">
-            <el-input v-model="addInfo.remark" type="textarea" :rows="4" placeholder="请输入备注" style="width: 380px" />
+            <el-input
+              v-model="addInfo.remark"
+              type="textarea"
+              :rows="4"
+              placeholder="请输入备注"
+              style="width: 380px"
+            />
           </inputVue>
         </div>
       </div>
     </div>
     <div class="order-list">
       <div class="title-box">
-        <div class="list-title">
-          产品列表
-        </div>
+        <div class="list-title">产品列表</div>
       </div>
       <div class="order-table">
         <el-table
@@ -106,7 +163,9 @@
           <el-table-column prop="productPrice" label="产品单价" />
           <el-table-column label="操作">
             <template slot-scope="scope">
-              删除
+              <el-button @click="deleteTableDataClick(scope.$index, scope.row)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -116,7 +175,7 @@
             <template slot-scope="scope">
               <el-select v-model="brandName" clearable placeholder="请选择">
                 <el-option
-                  v-for="item in brandList"
+                  v-for="item in list.brandList"
                   :key="item.brandCode"
                   :label="item.brandName"
                   :value="item.brandName"
@@ -128,7 +187,7 @@
             <template slot-scope="scope">
               <el-select v-model="categoryIds" clearable placeholder="请选择" @change="categoryIdChange">
                 <el-option
-                  v-for="item in categoryList"
+                  v-for="item in list.categoryList"
                   :key="item.id"
                   :label="item.categoryName"
                   :value="item.categoryName"
@@ -138,20 +197,26 @@
           </el-table-column>
           <el-table-column prop="productCode" label="产品型号">
             <el-select v-model="productCode" clearable placeholder="请选择">
-              <el-option v-for="item in CodeList" :key="item.id" :label="item.productCode" :value="item.productCode" />
+              <el-option
+                v-for="item in list.codeList"
+                :key="item.id"
+                :label="item.productCode"
+                :value="item.productCode"
+              />
             </el-select>
           </el-table-column>
           <el-table-column prop="productQuantity" label="产品数量">
-            <el-input v-model="addInfo.productList.productQuantity" placeholder="请输入内容" />
+            <el-input
+              v-model="addInfo.productList.productQuantity"
+              placeholder="请输入内容"
+            />
           </el-table-column>
           <el-table-column prop="productPrice" label="产品单价">
             <el-input v-model="productPrice1" placeholder="请输入内容" />
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-              <el-button @click="addTableDataClick">
-                保存
-              </el-button>
+              <el-button @click="addTableDataClick"> 保存 </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -165,145 +230,223 @@
       </div>
     </div>
     <div class="btnBox">
-      <el-button type="primary" class="save" @click="save">
-        保存
-      </el-button>
+      <el-button type="primary" class="save" @click="save"> 保存 </el-button>
       <!-- <el-button type="info" class="close">取消</el-button> -->
     </div>
   </div>
 </template>
 
 <script>
-import RedStar from '../../components/mycomponent/redStar.vue'
-import inputVue from '../../components/mycomponent/input/inputVue.vue'
+import RedStar from "../../components/mycomponent/redStar.vue";
+import inputVue from "../../components/mycomponent/input/inputVue.vue";
 
-import { add, order_area } from '../../api/order/order'
-import { C_list } from '../../api/product/category'
-import { SelectList } from '../../api/product/brand'
-import { list } from '../../api/product/product'
+import { add, order_area } from "../../api/order/order";
+import { C_list } from "../../api/product/category";
+import { SelectList } from "../../api/product/brand";
+import { list } from "../../api/product/product";
 export default {
+  name:'orderShop',
   components: {
     RedStar,
-    inputVue
+    inputVue,
   },
   data() {
     return {
-      brandName: '',
-      categoryIds: '',
-      productCode: '',
-      productQuantity1: '',
-      productPrice1: '',
-      CodeList: [],
-      brandList: [],
-      categoryList: [],
-      productList: [{ index: '' }],
+      brandName: "",
+      categoryIds: "",
+      productCode: "",
+      productQuantity1: "",
+      productPrice1: "",
+      list: {
+        codeList: [],
+        brandList: [],
+        categoryList: [],
+      },
+      productList: [{ index: "" }],
       isShowAdd: false, // 添加采购需求
       options: {},
       addInfo: {
-        userName: '', // 下单人
-        userPhone: '', // 联系方式
-        signDate: '', // 签订日期
-        deliveryDate: '', // 交付日期
-        deliveryProvince: '', // 地址-省
-        deliveryCity: '', // 地址-市
-        deliveryArea: '', // 地址-区
-        deliveryAddress: '', // 详细地址
-        receiver: '', // 收货人
-        receiverPhone: '', // 收货人联系方式
-        remark: '', // 备注
-        productList: []
+        userName: "", // 下单人
+        userPhone: "", // 联系方式
+        signDate: "", // 签订日期
+        deliveryDate: "", // 交付日期
+        deliveryProvince: "", // 地址-省
+        deliveryCity: "", // 地址-市
+        deliveryArea: "", // 地址-区
+        deliveryAddress: "", // 详细地址
+        receiver: "", // 收货人
+        receiverPhone: "", // 收货人联系方式
+        remark: "", // 备注
+        productList: [],
       },
       form: {
         provinceList: [],
         cityList: [],
-        countyList: []
+        countyList: [],
       },
       CITY: [],
-      XIAN: []
-    }
+      XIAN: [],
+    };
   },
   watch: {
     addInfo: {
       handler(newval, oldval) {
-        console.log(newval, oldval)
         if (!this.addInfo.deliveryProvince) {
-          this.addInfo.deliveryCity = ''
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryCity = "";
+          this.addInfo.deliveryArea = "";
         } else if (!this.addInfo.deliveryCity) {
-          this.addInfo.deliveryArea = ''
+          this.addInfo.deliveryArea = "";
         }
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
-    order_area('pid=0', {}).then((res) => {
-      console.log(res, 'Sheng')
-      this.form.provinceList = res
-    })
-    C_list().then(res => {
-      this.categoryList = res.data
+    order_area("pid=0", {}).then((res) => {
+      console.log(res, "Sheng");
+      this.form.provinceList = res;
+    });
+    C_list().then((res) => {
+      // 获取产品品类列表
+      this.list.categoryList = res.data;
     }),
-    SelectList().then(res => {
-      this.brandList = res
-    })
+      SelectList().then((res) => {
+        // 获取产品品牌列表
+        this.list.brandList = res;
+      });
   },
   methods: {
     save() {
-      add(this.addInfo).then((res) => {
-        console.log(res)
-      })
-      this.addInfo = {}
+      if (this.valiateProduct()) {
+        if (this.valiateForm()) {
+          add(this.addInfo).then((res) => {
+            // 添加成功
+            this.$message({
+              message: "保存成功",
+              type: "success",
+            });
+            this.addInfo = {
+              userName: "", // 下单人
+              userPhone: "", // 联系方式
+              signDate: "", // 签订日期
+              deliveryDate: "", // 交付日期
+              deliveryProvince: "", // 地址-省
+              deliveryCity: "", // 地址-市
+              deliveryArea: "", // 地址-区
+              deliveryAddress: "", // 详细地址
+              receiver: "", // 收货人
+              receiverPhone: "", // 收货人联系方式
+              remark: "", // 备注
+              productList: [],
+            };
+          });
+        }
+      }
     },
     provinceChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Shi')
-        this.form.cityList = res
-      })
+        console.log(res, "Shi");
+        this.form.cityList = res;
+      });
     },
     cityChange(that) {
-      console.log(that)
+      console.log(that);
       order_area(`pid=${that}`, {}).then((res) => {
-        console.log(res, 'Xian')
-        this.form.countyList = res
-      })
+        console.log(res, "Xian");
+        this.form.countyList = res;
+      });
     },
     showAddDialogClick() {
-      this.isShowAdd = true
+      this.isShowAdd = true;
     },
     close() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addTableDataClick() {
-      const obj = {}
-      obj.brandName = this.brandName
-      obj.categoryIds = this.categoryIds
-      obj.productCode = this.productCode
-      obj.productQuantity = this.addInfo.productList.productQuantity
-      obj.productPrice = this.productPrice1
-      this.addInfo.productList.push(obj)
-      this.brandName = '',
-      this.categoryIds = '',
-      this.productCode = '',
-      this.productQuantity1 = '',
-      this.productPrice1 = ''
+      const obj = {};
+      obj.brandName = this.brandName;
+      obj.categoryIds = this.categoryIds;
+      obj.productCode = this.productCode;
+      obj.productQuantity = this.productQuantity1;
+      obj.productPrice = this.productPrice1;
+      this.addInfo.productList.push(obj);
+      (this.brandName = ""),
+        (this.categoryIds = ""),
+        (this.productCode = ""),
+        (this.productQuantity1 = ""),
+        (this.productPrice1 = "");
+    },
+    deleteTableDataClick(tabIndex, row) {
+      this.addInfo.productList = this.addInfo.productList.filter(
+        (product, index) => {
+          return index !== tabIndex;
+        }
+      );
     },
     categoryIdChange(e) {
-      const index = this.categoryList.findIndex(item => {
-        return item.categoryName == e
-      })
-      console.log(index)
-      const code = this.categoryList[index].id
-      console.log(code)
-      list({ categoryId: code }).then(res => {
-        console.log(res)
-        this.CodeList = res
-      })
-    }
-  }
-}
+      const index = this.list.categoryList.findIndex((item) => {
+        return item.categoryName == e;
+      });
+      console.log(index);
+      const code = this.list.categoryList[index].id;
+      console.log(code);
+      // 获取产品型号列表
+      list({ categoryId: code }).then((res) => {
+        this.list.CodeList = res;
+      });
+    },
+    valiateProduct() {
+      // 验证产品列表
+      if (this.addInfo.productList.length) {
+        return true;
+      } else {
+        this.$message({
+          message: "产品列表不能为空",
+          type: "error",
+        });
+        return false;
+      }
+    },
+    valiateForm() {
+      const {
+        addInfo: {
+          userName,
+          userPhone,
+          signDate,
+          deliveryDate,
+          deliveryProvince,
+          deliveryCity,
+          deliveryArea,
+          deliveryAddress,
+          receiver,
+          receiverPhone,
+        },
+      } = this;
+      if (
+        userName &&
+        userPhone &&
+        signDate &&
+        deliveryDate &&
+        deliveryProvince &&
+        deliveryCity &&
+        deliveryArea &&
+        deliveryAddress &&
+        receiver &&
+        receiverPhone
+      ) {
+        return true;
+      } else {
+        this.$message({
+          message: "请先填写完整订单信息",
+          type: "error",
+        });
+        return false;
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, '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
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 7930e4c..80a22b2 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="序号" />-->
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -156,10 +156,12 @@
 import {
   C_listPage,
   C_batchDelete,
-  C_delete
+  C_delete, C_listExport
 } from '../../api/product/category'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listExport } from '@/api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default { // 加入分页逻辑
   components: {
@@ -199,6 +201,8 @@
         categoryCode: '',
         categoryName: ''
       }
+      this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 获取指定页面
     getListPage(limit, offset) {
@@ -271,8 +275,19 @@
       this.$refs.addDialog.initDialog('update', row)
     },
     exportToExcel() {
-      C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.data.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      C_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '品类列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 001921f..e1e9818 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -33,10 +33,10 @@
         <div class="inputBox" style="width: 144px">
           <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 categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
+          <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>
         设备状态
@@ -69,7 +69,7 @@
         <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">
@@ -82,6 +82,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{'text-align': 'center' ,background:'  #2483b3',color:'white'}"
@@ -92,13 +93,6 @@
         type="selection"
         width="55"
       />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column
-      prop="id"
-      label="序号"
-
-     >
-    </el-table-column> -->
       <el-table-column
         prop="snCode"
         label="SN码"
@@ -168,10 +162,10 @@
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade } from '../../api/product/device'
+import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade, d_listExport } from '../../api/product/device'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { C_list } from '../../api/product/category'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SelectList } from '../../api/product/brand'
+import { exportFile } from '@/utils/exportutils'
 export default {
   components: {
     DataInfoItem,
@@ -190,7 +184,7 @@
         deviceStatus: '',
         deviceBindUser: ''
       },
-      categoryList: [],
+      brandList: [],
       DevState: [
 
         {
@@ -220,9 +214,8 @@
     d_statistics().then(res => {
       this.statistics = res
     })
-    C_list().then(res => {
-      console.log(res)
-      this.categoryList = res
+    SelectList().then(res => {
+      this.brandList = res
     })
   },
   methods: {
@@ -236,12 +229,16 @@
     // },
     // 获取指定页面
     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.tableData = res
+        this.loading = false
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -253,6 +250,7 @@
         deviceBindUser: ''
       }
       this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 批量删除
     BatchDelete() {
@@ -262,14 +260,14 @@
       dle_ary.forEach(ele => {
         ids.push(ele.id)
       })
-      d_unbind({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      d_unbind({ deviceIds: ids }).then(res => {
+        this.$message({
+          message: res || '解绑成功',
+          type: 'success'
+        })
+        this.refresh()
+      }).catch(_ => {
+
       })
     },
     Upgrade() {
@@ -281,18 +279,27 @@
         ids.push(ele.deviceId)
       })
       d_firmwareUpgrade({ deviceIds: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '升级成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: res || '升级成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     exportToExcel() {
-      d_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      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)
       })
     }
   }
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 309ce79..4ee9765 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -39,6 +39,7 @@
       <el-table
         id="out-table"
         ref="multipleTable"
+        v-loading="loading"
         :data="tableData"
         style="width: 100%"
         :row-class-name="tableRowClassName"
@@ -46,7 +47,7 @@
       >
         <el-table-column type="selection" width="55" />
         <!--        <el-table-column type="index" label="编号" width="55" />-->
-        <el-table-column header-align="center" align="center" prop="id" label="序号" />
+        <!--        <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="产品品牌" />
@@ -80,7 +81,7 @@
     </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 v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
+    <productBindDialog ref="bindDialog" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
 
@@ -157,9 +158,11 @@
       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
       })
     },
     setLimit(crrentSize) {
@@ -230,9 +233,11 @@
       this.refresh()
     },
     handleBind(row) {
+      console.log('bindService')
       console.log(row)
-      this.isBindShow = true
       this.dataInfo = row
+      this.$refs.bindDialog.initDialog(row)
+      this.isBindShow = true
     },
     BindDialogClose() {
       this.isBindShow = false
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 3481108..14d8f18 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -67,6 +67,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -78,8 +79,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
+      <!--      <el-table-column prop="index" label="序号" />-->
       <el-table-column prop="snFixedId" label="SN码（固定标识）" />
       <el-table-column prop="snFixedIllustration" label="SN码（固定标识）说明" />
       <el-table-column prop="snStartCode" label="SN码（起始序列号）" />
@@ -125,8 +125,8 @@
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { SN_listPage, SN_batchDelete, SN_delete } from '../../api/product/snCodeField'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listPage, SN_batchDelete, SN_delete, SN_listExport } from '../../api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   components: {
@@ -149,18 +149,23 @@
     tableRowClassName: tableRowClassName,
     closeAdd() {
       this.isShowAdd = false
+      this.refresh()
     },
     addCategory() {
       this.isShowAdd = true
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      SN_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-      // 得到相关数据
+      this.loading = true
+      SN_listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
+        this.loading = false
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -168,44 +173,50 @@
         keyword: '',
         productCode: ''
       }
+      this.limit = 10
+      this.offset = 1
+      this.refresh()
     },
     exportToExcel() {
-      SN_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      SN_listExport(this.selectInfo).then(res => {
+        console.log()
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        let fileName = '设备sn码列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     },
     // 批量删除
     BatchDelete() {
       //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
+      const ids = this.$refs.multipleTable.selection.map(item => item.id)
       SN_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: '删除成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
       const id = row.id
       SN_delete({ id: id }).then(res => {
-        // console.log(res);
         // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: '删除成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     }
   }
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 8c0d4cd..58c8ca9 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -32,6 +32,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -43,8 +44,6 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="snCode" label="SN码（固定标识）" />
       <el-table-column prop="snQuantity" label="SN码（固定标识）个数" />
       <el-table-column prop="snIllustration" label="SN码（固定标识）说明" />
@@ -115,12 +114,14 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
+      this.loading = true
       S_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
       })
     },
     reset() {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index f573fd8..bed5935 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -21,7 +21,12 @@
             placeholder="请选择服务类型"
             style="width: 200px"
           >
-            <el-option v-for="item in options" :key="item.id" :label="item.typeName" :value="item.typeCode" />
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.typeName"
+              :value="item.typeCode"
+            />
           </el-select>
         </div>
       </div>
@@ -34,7 +39,14 @@
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -47,7 +59,7 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
-          @click=" BatchDelete"
+          @click="BatchDelete"
         >
           删除
         </el-button>
@@ -64,6 +76,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" />
@@ -75,18 +88,10 @@
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="Bdelete(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -117,100 +122,141 @@
 
 <script>
 // 组件
-import ManagementAddDialog from '../../components/mycomponent/dialog/server/managementAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import ManagementAddDialog from "../../components/mycomponent/dialog/server/managementAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { listPage, M_batchDelete, M_delete } from '../../api/server/Management'
-import { TM_list } from '../../api/server/TypeManagement'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
+import { listPage, M_batchDelete, M_delete } from "../../api/server/Management";
+import { TM_list } from "../../api/server/TypeManagement";
 
 export default {
   components: {
     ManagementAddDialog,
-    GroupPage
+    GroupPage,
   },
   mixins: [listMixin, elDataDialog],
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       selectInfo: {
-        serviceName: '',
-        typeCode: ''
+        serviceName: "",
+        typeCode: "",
       },
       options: [],
-      title: ''
-    }
+      title: "",
+      loading:false
+    };
   },
   mounted() {
-    TM_list().then(res => {
-      console.log(res)
-      this.options = res
-    })
+    TM_list().then((res) => {
+      console.log(res);
+      this.options = res;
+    });
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
-      this.refresh()
+      this.isShowAdd = false;
+      this.refresh();
     },
     addCategory() {
-      this.title = '服务新增'
-      this.isShowAdd = true
-      this.rowInfo = ''
+      this.title = "服务新增";
+      this.isShowAdd = true;
+      this.rowInfo = {
+        serviceCode: "",
+        serviceName: "",
+        typeCode: "",
+        description: "",
+        serviceTime: "",
+        remark: "",
+        id: "",
+      };
     },
     handleClick(row) {
-      this.title = '服务编辑'
-      this.isShowAdd = true
-      console.log(row)
-      this.rowInfo = row
+      this.title = "服务编辑";
+      this.isShowAdd = true;
+      console.log(row);
+      this.rowInfo = row;
+    },
+    reset() {
+      // 重置
+      this.selectInfo = {
+        serviceName: "",
+        typeCode: "",
+      };
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        // 得到相关数据
-        res.rows.forEach((item, index) => {
-          item.index = (index + 1) + ((offset - 1) * 10)
-        })
-        this.tableData = res
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err => {
+        this.loading = false
       })
     },
     // 批量删除
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      M_batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            M_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
           })
-          this.refresh()
-        }
-      })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
     },
     // 删除
     Bdelete(row) {
-      // console.log(row);
-      const id = row.id
-      M_delete({ id: id }).then(res => {
-        // console.log(res);
-        // 删除成功跟新数据
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
-    }
-  }
-}
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          M_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -252,7 +298,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }
 
diff --git a/src/views/server/TypeManagement.vue b/src/views/server/TypeManagement.vue
index 4fe0cab..c13185a 100644
--- a/src/views/server/TypeManagement.vue
+++ b/src/views/server/TypeManagement.vue
@@ -5,21 +5,41 @@
       <div class="serveInput">
         服务类型名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.typeName" placeholder="请输入服务类型名称" clearable class="serve-input" />
+          <el-input
+            v-model="selectInfo.typeName"
+            placeholder="请输入服务类型名称"
+            clearable
+            class="serve-input"
+          />
         </div>
       </div>
       <div class="serveBtn">
         <!-- <el-button type="primary" class="btnItem">查询</el-button>
         <el-button type="success" class="btnItem bggreen" @click="addCategory">新增</el-button>
         <el-button type="danger" class="btnItem bgred">删除</el-button> -->
-        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="btnItem"
+          @click="selectData"
+        >
           查询
         </el-button>
 
-        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
+        <el-button
+          type="success"
+          icon="el-icon-circle-plus-outline"
+          class="btnItem bggreen"
+          @click="addCategory"
+        >
           新增
         </el-button>
-        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
+        <el-button
+          type="danger"
+          icon="el-icon-delete-solid"
+          class="btnItem bgred"
+          @click="BatchDelete"
+        >
           删除
         </el-button>
       </div>
@@ -35,9 +55,15 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" :index="indexMethod" label="序号" width="55" />
+      <el-table-column
+        type="index"
+        :index="indexMethod"
+        label="序号"
+        width="55"
+      />
       <el-table-column prop="typeCode" label="服务类型编号" />
       <el-table-column prop="typeName" label="服务类型名称" />
       <el-table-column prop="description" label="描述" />
@@ -71,101 +97,148 @@
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog ></brand-add-dialog> -->
-    <typeAddDialog v-if="isShowAdd" :title="dialoaTitle" :data-info="dataInfo" @close="closeAdd" @refresh="refresh" />
+    <typeAddDialog
+      v-if="isShowAdd"
+      :title="dialoaTitle"
+      :data-info="dataInfo"
+      @close="closeAdd"
+      @refresh="refresh"
+    />
   </div>
 </template>
 
 <script>
 // 组件
-import typeAddDialog from '../../components/mycomponent/dialog/server/typeAddDialog.vue'
-import GroupPage from '../../components/mycomponent/groupPage.vue'
+import typeAddDialog from "../../components/mycomponent/dialog/server/typeAddDialog.vue";
+import GroupPage from "../../components/mycomponent/groupPage.vue";
 
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { listMixin } from '../../utils/myUtils/mixins/listPage'
-import { listPage, typeDelete, batchDelete } from '../../api/server/TypeManagement'
-export default { // 加入分页逻辑
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
+import { listMixin } from "../../utils/myUtils/mixins/listPage";
+import {
+  listPage,
+  typeDelete,
+  batchDelete,
+} from "../../api/server/TypeManagement";
+export default {
+  // 加入分页逻辑
   components: {
-    typeAddDialog, GroupPage
+    typeAddDialog,
+    GroupPage,
   },
   mixins: [listMixin],
   data() {
     return {
       dataInfo: {},
       selectInfo: {
-        typeName: ''
+        typeName: "",
       },
-      dialoaTitle: '',
-      isShowAdd: false // 显示新增功能
-    }
+      dialoaTitle: "",
+      isShowAdd: false, // 显示新增功能
+      loading: false,
+    };
   },
   methods: {
     // 生成序号
     indexMethod(index) {
-      return index + 1
+      return index + 1;
     },
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addCategory() {
-      this.isShowAdd = true
-      this.dialoaTitle = '新增服务类型'
+      this.isShowAdd = true;
+      this.dialoaTitle = "新增服务类型";
+      this.dataInfo = {
+        typeCode: "", // 服务类型编号
+        typeName: "", // 服务类型名称
+        description: "", // 描述
+        remark: "", // 备注
+        qualifyIds: [""], // 资质要求
+      };
     },
     handleClick(row) {
-      console.log(row)
-      this.isShowAdd = true
-      this.dialoaTitle = '编辑'
-      this.dataInfo = row
+      console.log(row);
+      this.isShowAdd = true;
+      this.dialoaTitle = "编辑";
+      this.dataInfo = row;
     },
     getListPage(limit, offset) {
-      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        console.log(res)
-        this.tableData = res
-      })
+      this.loading = true;
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo)
+        .then((res) => {
+          console.log(res);
+          this.tableData = res;
+          this.loading = false;
+        })
+        .catch((err) => {
+          this.loading = false;
+        });
     },
     dealAry(scope) {
-      const ary = scope.row.qualifys.map(item => {
-        return item.qualifyName
-      })
-      let str = ''
+      const ary = scope.row.qualifys.map((item) => {
+        return item.qualifyName;
+      });
+      let str = "";
       for (let i = 0; i < ary.length; i++) {
-        str += ary[i]
+        str += ary[i];
       }
-      return str
+      return str;
     },
     Bdelete(row) {
-      const id = row.id
-      typeDelete({ id: id }).then(res => {
-        console.log(res)
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      this.$confirm(`确认删除此服务类型吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          const id = row.id;
+          typeDelete({ id: id }).then((res) => {
+            console.log(res);
+            this.$message({
+              message: "删除成功",
+              type: "success",
+            });
+            this.refresh();
+          });
+        })
+        .catch(() => {});
     },
     BatchDelete() {
-      //  得到选中行
-      const dle_ary = this.$refs.multipleTable.selection
-      const ids = []
-      dle_ary.forEach(ele => {
-        ids.push(ele.id)
-      })
-      batchDelete({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的服务类型吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            batchDelete({ ids: ids }).then((res) => {
+              if (res != "") {
+                this.$message({
+                  message: "删除成功",
+                  type: "success",
+                });
+                this.refresh();
+              }
+            });
           })
-          this.refresh()
-        }
-      })
-    }
-  }
-}
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务类型",
+          type: "error",
+        });
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/server/operation.vue b/src/views/server/operation.vue
index 40d80ad..1a8c863 100644
--- a/src/views/server/operation.vue
+++ b/src/views/server/operation.vue
@@ -6,7 +6,7 @@
         服务名称
         <div class="inputBox" style="width: 120px">
           <el-input
-            v-model="input"
+            v-model="selectInfo.input"
             placeholder="请输入服务名称"
             clearable
             class="product-input"
@@ -18,10 +18,18 @@
           type="primary"
           icon="el-icon-search"
           class="btnItem"
+          @click="selectData"
         >
           查询
         </el-button>
-
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          class="btnItem"
+          @click="reset"
+        >
+          重置
+        </el-button>
         <el-button
           type="success"
           icon="el-icon-circle-plus-outline"
@@ -34,12 +42,14 @@
           type="danger"
           icon="el-icon-delete-solid"
           class="btnItem bgred"
+          @click="BatchDelete"
         >
           删除
         </el-button>
       </div>
     </div>
     <el-table
+    ref="multipleTable"
       :data="tableData"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -49,6 +59,7 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
+      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="date1" label="序号" />
@@ -60,18 +71,10 @@
 
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="handleClick(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            size="small"
-            @click="handleClick(scope.row)"
-          >
+          <el-button type="text" size="small" @click="Bdelete(scope.row)">
             删除
           </el-button>
           <!-- <el-button type="text" size="small">编辑</el-button> -->
@@ -93,97 +96,175 @@
     <!-- 新增弹框 -->
 
     <!-- <brand-add-dialog ></brand-add-dialog> -->
-    <operation-add-dialog
-      :is-show-info="isShowAdd"
-      @close="closeAdd"
-    />
+    <operation-add-dialog :is-show-info="isShowAdd" @close="closeAdd" ref='addDialog'/>
   </div>
 </template>
 
 <script>
 // 组件
 // import BrandAddDialog from '../../components/mycomponent/dialog/brandAddDialog.vue';
-import OperationAddDialog from '../../components/mycomponent/dialog/server/operationAddDialog.vue'
-
+import OperationAddDialog from "../../components/mycomponent/dialog/server/operationAddDialog.vue";
+import { listPage, O_batchDelete, O_delete } from "../../api/server/operation";
 // 逻辑
-import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
 
 export default {
   components: {
-    OperationAddDialog
+    OperationAddDialog,
   },
   data() {
     return {
       isShowAdd: false, // 显示新增功能
       tableData: [
         {
-          date1: '1',
-          date: 'fwyy001',
-          name: '4年免费换新',
-          address: '129',
-          address1: '限时9折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "1",
+          date: "fwyy001",
+          name: "4年免费换新",
+          address: "129",
+          address1: "限时9折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '2',
-          date: 'fwyy002',
-          name: '5年免费换新',
-          address: '169',
-          address1: '限时9折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "2",
+          date: "fwyy002",
+          name: "5年免费换新",
+          address: "169",
+          address1: "限时9折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '3',
-          date: 'fwyy003',
-          name: '6年全面保修',
-          address: '94',
-          address1: '限时8折',
-          address2: '2022/06/01-2022/06/15'
+          date1: "3",
+          date: "fwyy003",
+          name: "6年全面保修",
+          address: "94",
+          address1: "限时8折",
+          address2: "2022/06/01-2022/06/15",
         },
         {
-          date1: '4',
-          date: 'fwyy004',
-          name: '7年免费换新',
-          address: '110',
-          address1: '限时8折',
-          address2: '2022/06/01-2022/06/15'
-        }
+          date1: "4",
+          date: "fwyy004",
+          name: "7年免费换新",
+          address: "110",
+          address1: "限时8折",
+          address2: "2022/06/01-2022/06/15",
+        },
       ],
       options: [
         {
-          value: '选项1',
-          label: '黄金糕'
+          value: "选项1",
+          label: "黄金糕",
         },
         {
-          value: '选项2',
-          label: '双皮奶'
+          value: "选项2",
+          label: "双皮奶",
         },
         {
-          value: '选项3',
-          label: '蚵仔煎'
+          value: "选项3",
+          label: "蚵仔煎",
         },
         {
-          value: '选项4',
-          label: '龙须面'
+          value: "选项4",
+          label: "龙须面",
         },
         {
-          value: '选项5',
-          label: '北京烤鸭'
-        }
+          value: "选项5",
+          label: "北京烤鸭",
+        },
       ],
-      value: ''
-    }
+      value: "",
+      selectInfo: {
+        input: "",
+      },
+      loading:false
+    };
   },
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false
+      this.isShowAdd = false;
     },
     addCategory() {
-      this.isShowAdd = true
-    }
-  }
-}
+      this.isShowAdd = true;
+    },
+    handleClick(row){
+      console.log(row, 'row')
+      this.$refs.addDialog.init(row)
+      this.isShowAdd = true;
+    },
+    reset() {
+      this.inpute = "";
+    },
+    // 获取指定页面
+    getListPage(limit, offset) {
+      this.loading = true
+      listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
+        (res) => {
+          // 得到相关数据
+          res.rows.forEach((item, index) => {
+            item.index = index + 1 + (offset - 1) * 10;
+          });
+          this.tableData = res;
+          this.loading = false
+        }
+      ).catch(err =>{
+        this.loading = false
+      })
+    },
+    // 批量删除
+    BatchDelete() {
+      if (this.$refs.multipleTable.selection.length !== 0) {
+        this.$confirm(`确认删除选中的这些服务吗？`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            //  得到选中行
+            const dle_ary = this.$refs.multipleTable.selection;
+            const ids = [];
+            dle_ary.forEach((ele) => {
+              ids.push(ele.id);
+            });
+            O_batchDelete({ ids: ids }).then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+            });
+          })
+          .catch(() => {});
+      } else {
+        this.$message({
+          message: "请先勾选需要删除的服务",
+          type: "error",
+        });
+      }
+    },
+    // 删除
+    Bdelete(row) {
+      this.$confirm(`确认删除此服务吗？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          // console.log(row);
+          const id = row.id;
+          O_delete({ id: id }).then((res) => {
+            // console.log(res);
+            // 删除成功跟新数据
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
+          });
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -225,7 +306,6 @@
         // width: 84px;
         font-size: 16px;
       }
-
     }
   }