diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index d721d6b..d37cc37 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -200,9 +200,13 @@
 
     // 燃气监测桩 指示带长度字段为必填
     const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    console.log(deviceTypeName, 'deviceTypeName')
     if (deviceTypeName === '燃气监测桩' || deviceTypeName === '智能警示桩') {
       isGaspile.value = true
     }
+    else {
+      isGaspile.value = false
+    }
   }
 }, {
   deep: true,
@@ -329,7 +333,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="!isGaspile && dataForm.watchObject === '3'" :gutter="24">
+      <!-- <el-row v-if="!isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
             <el-input
@@ -346,7 +350,7 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">

diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index d721d6b..d37cc37 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -200,9 +200,13 @@
 
     // 燃气监测桩 指示带长度字段为必填
     const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    console.log(deviceTypeName, 'deviceTypeName')
     if (deviceTypeName === '燃气监测桩' || deviceTypeName === '智能警示桩') {
       isGaspile.value = true
     }
+    else {
+      isGaspile.value = false
+    }
   }
 }, {
   deep: true,
@@ -329,7 +333,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="!isGaspile && dataForm.watchObject === '3'" :gutter="24">
+      <!-- <el-row v-if="!isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
             <el-input
@@ -346,7 +350,7 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 789f1f9..9c55873 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -227,7 +227,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="pipeCode">
+              <el-form-item label="关联管线">
                 <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
                   <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>

diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index d721d6b..d37cc37 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -200,9 +200,13 @@
 
     // 燃气监测桩 指示带长度字段为必填
     const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    console.log(deviceTypeName, 'deviceTypeName')
     if (deviceTypeName === '燃气监测桩' || deviceTypeName === '智能警示桩') {
       isGaspile.value = true
     }
+    else {
+      isGaspile.value = false
+    }
   }
 }, {
   deep: true,
@@ -329,7 +333,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="!isGaspile && dataForm.watchObject === '3'" :gutter="24">
+      <!-- <el-row v-if="!isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
             <el-input
@@ -346,7 +350,7 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 789f1f9..9c55873 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -227,7 +227,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="pipeCode">
+              <el-form-item label="关联管线">
                 <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
                   <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index a88f6c7..40825a5 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -23,8 +23,8 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
-  { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '设备编号', value: 'devcode', align: 'center', isRequired: true, width: '150' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true, width: '220' },
   { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
@@ -34,7 +34,7 @@
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
   { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '120' },
   { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
 // 最终展示列
@@ -76,7 +76,7 @@
 const fetchData = () => {
   loadingTable.value = true
   getDeviceListPage(listQuery.value).then((res) => {
-    console.log(res.data, '数据列表')
+    // console.log(res.data, '数据列表')
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
@@ -171,6 +171,7 @@
     bfDevice({
       bfcf: row.bfcf === '1' ? '0' : '1',
       id: row.id,
+      devcode: row.devcode,
     }).then((res) => {
       ElMessage.success('操作成功')
       fetchData()
@@ -244,7 +245,7 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   templateDevice().then((res) => {
-    console.log(res.data, '123123')
+    // console.log(res.data, '123123')
     if (res.data) {
       downloadFile(res.data, '设备导入模板.xlsx')
     }
@@ -421,7 +422,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>

diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index d721d6b..d37cc37 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -200,9 +200,13 @@
 
     // 燃气监测桩 指示带长度字段为必填
     const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    console.log(deviceTypeName, 'deviceTypeName')
     if (deviceTypeName === '燃气监测桩' || deviceTypeName === '智能警示桩') {
       isGaspile.value = true
     }
+    else {
+      isGaspile.value = false
+    }
   }
 }, {
   deep: true,
@@ -329,7 +333,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="!isGaspile && dataForm.watchObject === '3'" :gutter="24">
+      <!-- <el-row v-if="!isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
             <el-input
@@ -346,7 +350,7 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 789f1f9..9c55873 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -227,7 +227,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="pipeCode">
+              <el-form-item label="关联管线">
                 <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
                   <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index a88f6c7..40825a5 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -23,8 +23,8 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
-  { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '设备编号', value: 'devcode', align: 'center', isRequired: true, width: '150' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true, width: '220' },
   { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
@@ -34,7 +34,7 @@
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
   { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '120' },
   { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
 // 最终展示列
@@ -76,7 +76,7 @@
 const fetchData = () => {
   loadingTable.value = true
   getDeviceListPage(listQuery.value).then((res) => {
-    console.log(res.data, '数据列表')
+    // console.log(res.data, '数据列表')
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
@@ -171,6 +171,7 @@
     bfDevice({
       bfcf: row.bfcf === '1' ? '0' : '1',
       id: row.id,
+      devcode: row.devcode,
     }).then((res) => {
       ElMessage.success('操作成功')
       fetchData()
@@ -244,7 +245,7 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   templateDevice().then((res) => {
-    console.log(res.data, '123123')
+    // console.log(res.data, '123123')
     if (res.data) {
       downloadFile(res.data, '设备导入模板.xlsx')
     }
@@ -421,7 +422,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index b59c84b..fa593b4 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -22,6 +22,7 @@
   powerSupplyMode: '', // 供电方式
   productName: '', // 产品名称
   protocol: '', // 通讯协议
+  productCode: '',
   id: '',
   ts: '',
 }) // 表单
@@ -51,6 +52,7 @@
     protocol: '', // 通讯协议
     id: '',
     ts: '',
+    productCode: '',
   }
 }
 
@@ -172,6 +174,14 @@
   <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}产品`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
+        <el-col v-if="dialogStatus !== 'add'" :span="12">
+          <el-form-item label="产品编号">
+            <el-input
+              v-model.trim="dataForm.productCode" type="text" disabled style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="产品名称" prop="productName">
             <el-input
@@ -187,8 +197,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备型号" prop="deviceModel">
             <el-input
@@ -204,8 +212,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="通讯协议" prop="protocol">
             <el-select v-model="dataForm.protocol" placeholder="通讯协议" style="width: 100%;" clearable filterable>
@@ -220,8 +226,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="供电方式" prop="powerSupplyMode">
             <el-select v-model="dataForm.powerSupplyMode" placeholder="供电方式" style="width: 100%;" clearable filterable>

diff --git a/src/views/home/device/device/components/addDialog.vue b/src/views/home/device/device/components/addDialog.vue
index d721d6b..d37cc37 100644
--- a/src/views/home/device/device/components/addDialog.vue
+++ b/src/views/home/device/device/components/addDialog.vue
@@ -200,9 +200,13 @@
 
     // 燃气监测桩 指示带长度字段为必填
     const deviceTypeName = deviceTypeList.value.filter((item: any) => item.id === dataForm.value.deviceType)[0].typeName
+    console.log(deviceTypeName, 'deviceTypeName')
     if (deviceTypeName === '燃气监测桩' || deviceTypeName === '智能警示桩') {
       isGaspile.value = true
     }
+    else {
+      isGaspile.value = false
+    }
   }
 }, {
   deep: true,
@@ -329,7 +333,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="!isGaspile && dataForm.watchObject === '3'" :gutter="24">
+      <!-- <el-row v-if="!isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
             <el-input
@@ -346,7 +350,7 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
       <el-row v-if="isGaspile" :gutter="24">
         <el-col :span="12">
           <el-form-item label="左侧指示带长度" prop="leftLength">
diff --git a/src/views/home/device/device/components/localtionForPieple.vue b/src/views/home/device/device/components/localtionForPieple.vue
index 789f1f9..9c55873 100644
--- a/src/views/home/device/device/components/localtionForPieple.vue
+++ b/src/views/home/device/device/components/localtionForPieple.vue
@@ -227,7 +227,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="关联管线" prop="pipeCode">
+              <el-form-item label="关联管线">
                 <el-select v-model="dataForm.pipeCode" placeholder="关联管线" style="width: 100%;" clearable filterable>
                   <el-option v-for="item in pipeList" :key="item.id" :label="item.name" :value="item.value" />
                 </el-select>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index a88f6c7..40825a5 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -23,8 +23,8 @@
 // 初始展示列
 const columns = ref<any>([
   { text: '状态', value: 'onlineState', align: 'center', isCustom: true, width: '55' },
-  { text: '设备编号', value: 'devcode', align: 'center', isRequired: true },
-  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true },
+  { text: '设备编号', value: 'devcode', align: 'center', isRequired: true, width: '150' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', isRequired: true, width: '220' },
   { text: '监测对象', value: 'watchObject', align: 'center', width: '85' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufactureName', align: 'center', isRequired: true },
@@ -34,7 +34,7 @@
   { text: '在用情况', value: 'validName', align: 'center', isRequired: true, width: '85' },
   { text: '布防状态', value: 'bfztName', align: 'center', isRequired: true },
   { text: '电量', value: 'cell', align: 'center', isRequired: true, width: '70' },
-  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '180' },
+  { text: '最新上报时间', value: 'logtime', align: 'center', isRequired: true, width: '120' },
   { text: '安装日期', value: 'installDate', align: 'center', isRequired: true, width: '120' },
 ])
 // 最终展示列
@@ -76,7 +76,7 @@
 const fetchData = () => {
   loadingTable.value = true
   getDeviceListPage(listQuery.value).then((res) => {
-    console.log(res.data, '数据列表')
+    // console.log(res.data, '数据列表')
     list.value = res.data.rows.map((item: any) => ({
       ...item,
       validName: useStatusList.value.length ? useStatusList.value[useStatusList.value.findIndex(citem => item.valid === citem.value)].name : '',
@@ -171,6 +171,7 @@
     bfDevice({
       bfcf: row.bfcf === '1' ? '0' : '1',
       id: row.id,
+      devcode: row.devcode,
     }).then((res) => {
       ElMessage.success('操作成功')
       fetchData()
@@ -244,7 +245,7 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   templateDevice().then((res) => {
-    console.log(res.data, '123123')
+    // console.log(res.data, '123123')
     if (res.data) {
       downloadFile(res.data, '设备导入模板.xlsx')
     }
@@ -421,7 +422,7 @@
         @change="changePage"
       >
         <template #preColumns>
-          <el-table-column label="序号" width="55" align="center">
+          <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
               {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
             </template>
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index b59c84b..fa593b4 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -22,6 +22,7 @@
   powerSupplyMode: '', // 供电方式
   productName: '', // 产品名称
   protocol: '', // 通讯协议
+  productCode: '',
   id: '',
   ts: '',
 }) // 表单
@@ -51,6 +52,7 @@
     protocol: '', // 通讯协议
     id: '',
     ts: '',
+    productCode: '',
   }
 }
 
@@ -172,6 +174,14 @@
   <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}产品`" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
       <el-row :gutter="24">
+        <el-col v-if="dialogStatus !== 'add'" :span="12">
+          <el-form-item label="产品编号">
+            <el-input
+              v-model.trim="dataForm.productCode" type="text" disabled style="width: 100%;"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="产品名称" prop="productName">
             <el-input
@@ -187,8 +197,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="设备型号" prop="deviceModel">
             <el-input
@@ -204,8 +212,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="通讯协议" prop="protocol">
             <el-select v-model="dataForm.protocol" placeholder="通讯协议" style="width: 100%;" clearable filterable>
@@ -220,8 +226,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="供电方式" prop="powerSupplyMode">
             <el-select v-model="dataForm.powerSupplyMode" placeholder="供电方式" style="width: 100%;" clearable filterable>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index fdd5463..284de27 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -16,13 +16,14 @@
 const total = ref(0)
 // 初始展示列
 const columns = ref<any>([
+  { text: '产品编号', value: 'productCode', align: 'center' },
   { text: '产品名称', value: 'productName', align: 'center' },
   { text: '设备类型', value: 'deviceTypeName', align: 'center' },
   { text: '设备型号', value: 'deviceModel', align: 'center' },
   { text: '厂商', value: 'manufacturerName', align: 'center' },
   { text: '通讯协议', value: 'protocolName', align: 'center' },
-  { text: '接入方式', value: 'accessMethodName', align: 'center', width: '140' },
-  { text: '创建时间', value: 'ts', align: 'center', width: '200' },
+  { text: '接入方式', value: 'accessMethodName', align: 'center', width: '130' },
+  { text: '创建时间', value: 'ts', align: 'center', width: '180' },
 ])
 // 最终展示列
 const columnsConfig = ref([])