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/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/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/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/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/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/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/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/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/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..c75e981 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,7 +152,20 @@
         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'] }],
+      },
     }
   },
   computed: {
@@ -189,13 +204,18 @@
       })
     },
     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()
+          }
+        })
+
         }
       })
     },
@@ -208,7 +228,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +244,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/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/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/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..c75e981 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,7 +152,20 @@
         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'] }],
+      },
     }
   },
   computed: {
@@ -189,13 +204,18 @@
       })
     },
     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()
+          }
+        })
+
         }
       })
     },
@@ -208,7 +228,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +244,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..23d020b 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -3,106 +3,41 @@
   <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>

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/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/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..c75e981 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,7 +152,20 @@
         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'] }],
+      },
     }
   },
   computed: {
@@ -189,13 +204,18 @@
       })
     },
     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()
+          }
+        })
+
         }
       })
     },
@@ -208,7 +228,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +244,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..23d020b 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -3,106 +3,41 @@
   <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>
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/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/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/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..c75e981 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,7 +152,20 @@
         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'] }],
+      },
     }
   },
   computed: {
@@ -189,13 +204,18 @@
       })
     },
     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()
+          }
+        })
+
         }
       })
     },
@@ -208,7 +228,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +244,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..23d020b 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -3,106 +3,41 @@
   <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>
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/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 001921f..0b2cb81 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -221,8 +221,7 @@
       this.statistics = res
     })
     C_list().then(res => {
-      console.log(res)
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {

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/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/snCodeFieldDialog.vue b/src/components/mycomponent/dialog/snCodeFieldDialog.vue
index 0adc36d..c75e981 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,7 +152,20 @@
         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'] }],
+      },
     }
   },
   computed: {
@@ -189,13 +204,18 @@
       })
     },
     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()
+          }
+        })
+
         }
       })
     },
@@ -208,7 +228,7 @@
         snFixedCode: '',
         snFixedIllustration: '',
         snStartCode: 0,
-        snEndCode: 0,
+        snEndCode: 99,
         snSegmentNum: '',
         productCode: '',
         productName: '',
@@ -224,20 +244,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..23d020b 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -3,106 +3,41 @@
   <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>
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/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 001921f..0b2cb81 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -221,8 +221,7 @@
       this.statistics = res
     })
     C_list().then(res => {
-      console.log(res)
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 309ce79..af03452 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -80,7 +80,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>
 
@@ -230,9 +230,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