diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index a68977e..e921346 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -40,12 +40,12 @@
             zoom: 18, // 初始化地图级别
             center:
               this.deviceList.length > 0 &&
-              this.deviceList[0].lat &&
-              this.deviceList[0].lon
+                this.deviceList[0].lat &&
+                this.deviceList[0].lon
                 ? [
-                    Number(this.deviceList[0].lon),
-                    Number(this.deviceList[0].lat),
-                  ]
+                  Number(this.deviceList[0].lon),
+                  Number(this.deviceList[0].lat),
+                ]
                 : [116.4, 39.9],
             resizeEnable: true,
           });
@@ -69,19 +69,26 @@
             title: this.deviceList[i].deviceName,
             content:
               '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
-            offset: new AMap.Pixel(-15, -20),
+            offset: new AMap.Pixel(0, 0),
           });
-          
-          
+
+          // 信息窗体
+          let info = [];
+          info.push("<div style=\"text-align:left;border-bottom:1px solid #ccc;\"><h4>设备信息</h4>");
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">设备名称 : ${this.deviceList[i].deviceName}`);
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">设备详情 : ${this.deviceList[i].productCode}`);
+          info.push(`<p class='input-item' style=\"border-bottom:1px solid #ccc\">ip地址 : ${this.deviceList[i].deviceIp}  Mac地址 : ${this.deviceList[i].deviceMac}`);
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">地址 : ${this.deviceList[i].deviceAddress}`); 
+          let infoWindow = new AMap.InfoWindow({
+            content: info.join("")  //使用默认信息窗体框样式，显示信息内容
+          });
+
+          marker.on("click", (e) => {
+            infoWindow.open(this.map, e.target.getPosition());
+          });
           // 将创建的点标记添加到已有的地图实例：
           this.map.add([marker]);
-          // 信息窗体
-          // var infoWindow = new AMap.InfoWindow({
-          //   content: "提示信息",
-          // });
-          // marker.on("click", function () {
-          //   infoWindow.open(map, marker.getPosition());
-          // });
+
         }
       }
     },
@@ -179,6 +186,7 @@
 .circle-three {
   animation: transition-circle 2s infinite 1.4s;
 }
+
 .circle-three {
   animation: transition-circle 2s infinite 1.8s;
 }
@@ -189,11 +197,13 @@
     height: 0px;
     opacity: 1;
   }
+
   50% {
     width: 30px;
     height: 30px;
     opacity: 0.5;
   }
+
   100% {
     width: 35px;
     height: 35px;

diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index a68977e..e921346 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -40,12 +40,12 @@
             zoom: 18, // 初始化地图级别
             center:
               this.deviceList.length > 0 &&
-              this.deviceList[0].lat &&
-              this.deviceList[0].lon
+                this.deviceList[0].lat &&
+                this.deviceList[0].lon
                 ? [
-                    Number(this.deviceList[0].lon),
-                    Number(this.deviceList[0].lat),
-                  ]
+                  Number(this.deviceList[0].lon),
+                  Number(this.deviceList[0].lat),
+                ]
                 : [116.4, 39.9],
             resizeEnable: true,
           });
@@ -69,19 +69,26 @@
             title: this.deviceList[i].deviceName,
             content:
               '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
-            offset: new AMap.Pixel(-15, -20),
+            offset: new AMap.Pixel(0, 0),
           });
-          
-          
+
+          // 信息窗体
+          let info = [];
+          info.push("<div style=\"text-align:left;border-bottom:1px solid #ccc;\"><h4>设备信息</h4>");
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">设备名称 : ${this.deviceList[i].deviceName}`);
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">设备详情 : ${this.deviceList[i].productCode}`);
+          info.push(`<p class='input-item' style=\"border-bottom:1px solid #ccc\">ip地址 : ${this.deviceList[i].deviceIp}  Mac地址 : ${this.deviceList[i].deviceMac}`);
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">地址 : ${this.deviceList[i].deviceAddress}`); 
+          let infoWindow = new AMap.InfoWindow({
+            content: info.join("")  //使用默认信息窗体框样式，显示信息内容
+          });
+
+          marker.on("click", (e) => {
+            infoWindow.open(this.map, e.target.getPosition());
+          });
           // 将创建的点标记添加到已有的地图实例：
           this.map.add([marker]);
-          // 信息窗体
-          // var infoWindow = new AMap.InfoWindow({
-          //   content: "提示信息",
-          // });
-          // marker.on("click", function () {
-          //   infoWindow.open(map, marker.getPosition());
-          // });
+
         }
       }
     },
@@ -179,6 +186,7 @@
 .circle-three {
   animation: transition-circle 2s infinite 1.4s;
 }
+
 .circle-three {
   animation: transition-circle 2s infinite 1.8s;
 }
@@ -189,11 +197,13 @@
     height: 0px;
     opacity: 1;
   }
+
   50% {
     width: 30px;
     height: 30px;
     opacity: 0.5;
   }
+
   100% {
     width: 35px;
     height: 35px;
diff --git a/src/components/mycomponent/dialog/snCodeRulsDialog.vue b/src/components/mycomponent/dialog/snCodeRulsDialog.vue
index eba7f1a..12124fc 100644
--- a/src/components/mycomponent/dialog/snCodeRulsDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeRulsDialog.vue
@@ -75,7 +75,8 @@
               {
                 digitItem: '',
                 digitPre: '',
-                digitItemIllustration: ''
+                digitItemIllustration: '',
+                digitPrelllustration:''
               }
 
             ]
@@ -116,7 +117,7 @@
           break
         }
         for (const code of rule.itemList) {
-          if (code.digitItem === '' || code.digitItemIllustration === '') {
+          if (code.digitItem === '' || code.digitItemIllustration === '' || code.digitPrelllustration == '') {
             message += `第${rindex + 1}项固定码中，编码项和编码说明不得为空！`
             flag = false
             break
@@ -190,7 +191,8 @@
               {
                 digitItem: '',
                 digitPre: '',
-                digitItemIllustration: ''
+                digitItemIllustration: '',
+                digitPrelllustration:'', // 前项编码说明
               }
 
             ]
@@ -208,7 +210,8 @@
           {
             digitItem: '', // 编码项
             digitPre: '', // 前项编码
-            digitItemIllustration: '' // 编码说明
+            digitItemIllustration: '', // 编码说明
+            digitPrelllustration:'', // 前项编码说明
           }
         ]
       })

diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index a68977e..e921346 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -40,12 +40,12 @@
             zoom: 18, // 初始化地图级别
             center:
               this.deviceList.length > 0 &&
-              this.deviceList[0].lat &&
-              this.deviceList[0].lon
+                this.deviceList[0].lat &&
+                this.deviceList[0].lon
                 ? [
-                    Number(this.deviceList[0].lon),
-                    Number(this.deviceList[0].lat),
-                  ]
+                  Number(this.deviceList[0].lon),
+                  Number(this.deviceList[0].lat),
+                ]
                 : [116.4, 39.9],
             resizeEnable: true,
           });
@@ -69,19 +69,26 @@
             title: this.deviceList[i].deviceName,
             content:
               '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
-            offset: new AMap.Pixel(-15, -20),
+            offset: new AMap.Pixel(0, 0),
           });
-          
-          
+
+          // 信息窗体
+          let info = [];
+          info.push("<div style=\"text-align:left;border-bottom:1px solid #ccc;\"><h4>设备信息</h4>");
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">设备名称 : ${this.deviceList[i].deviceName}`);
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">设备详情 : ${this.deviceList[i].productCode}`);
+          info.push(`<p class='input-item' style=\"border-bottom:1px solid #ccc\">ip地址 : ${this.deviceList[i].deviceIp}  Mac地址 : ${this.deviceList[i].deviceMac}`);
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">地址 : ${this.deviceList[i].deviceAddress}`); 
+          let infoWindow = new AMap.InfoWindow({
+            content: info.join("")  //使用默认信息窗体框样式，显示信息内容
+          });
+
+          marker.on("click", (e) => {
+            infoWindow.open(this.map, e.target.getPosition());
+          });
           // 将创建的点标记添加到已有的地图实例：
           this.map.add([marker]);
-          // 信息窗体
-          // var infoWindow = new AMap.InfoWindow({
-          //   content: "提示信息",
-          // });
-          // marker.on("click", function () {
-          //   infoWindow.open(map, marker.getPosition());
-          // });
+
         }
       }
     },
@@ -179,6 +186,7 @@
 .circle-three {
   animation: transition-circle 2s infinite 1.4s;
 }
+
 .circle-three {
   animation: transition-circle 2s infinite 1.8s;
 }
@@ -189,11 +197,13 @@
     height: 0px;
     opacity: 1;
   }
+
   50% {
     width: 30px;
     height: 30px;
     opacity: 0.5;
   }
+
   100% {
     width: 35px;
     height: 35px;
diff --git a/src/components/mycomponent/dialog/snCodeRulsDialog.vue b/src/components/mycomponent/dialog/snCodeRulsDialog.vue
index eba7f1a..12124fc 100644
--- a/src/components/mycomponent/dialog/snCodeRulsDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeRulsDialog.vue
@@ -75,7 +75,8 @@
               {
                 digitItem: '',
                 digitPre: '',
-                digitItemIllustration: ''
+                digitItemIllustration: '',
+                digitPrelllustration:''
               }
 
             ]
@@ -116,7 +117,7 @@
           break
         }
         for (const code of rule.itemList) {
-          if (code.digitItem === '' || code.digitItemIllustration === '') {
+          if (code.digitItem === '' || code.digitItemIllustration === '' || code.digitPrelllustration == '') {
             message += `第${rindex + 1}项固定码中，编码项和编码说明不得为空！`
             flag = false
             break
@@ -190,7 +191,8 @@
               {
                 digitItem: '',
                 digitPre: '',
-                digitItemIllustration: ''
+                digitItemIllustration: '',
+                digitPrelllustration:'', // 前项编码说明
               }
 
             ]
@@ -208,7 +210,8 @@
           {
             digitItem: '', // 编码项
             digitPre: '', // 前项编码
-            digitItemIllustration: '' // 编码说明
+            digitItemIllustration: '', // 编码说明
+            digitPrelllustration:'', // 前项编码说明
           }
         ]
       })
diff --git a/src/components/mycomponent/snCode/codeField.vue b/src/components/mycomponent/snCode/codeField.vue
index 848f023..7ed5b88 100644
--- a/src/components/mycomponent/snCode/codeField.vue
+++ b/src/components/mycomponent/snCode/codeField.vue
@@ -140,7 +140,8 @@
       this.itemInfo.itemList.push({
         digitItem: '',
         digitPre: '',
-        digitItemIllustration: ''
+        digitItemIllustration: '',
+        digitPrelllustration:''
       })
     }
 

diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index a68977e..e921346 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -40,12 +40,12 @@
             zoom: 18, // 初始化地图级别
             center:
               this.deviceList.length > 0 &&
-              this.deviceList[0].lat &&
-              this.deviceList[0].lon
+                this.deviceList[0].lat &&
+                this.deviceList[0].lon
                 ? [
-                    Number(this.deviceList[0].lon),
-                    Number(this.deviceList[0].lat),
-                  ]
+                  Number(this.deviceList[0].lon),
+                  Number(this.deviceList[0].lat),
+                ]
                 : [116.4, 39.9],
             resizeEnable: true,
           });
@@ -69,19 +69,26 @@
             title: this.deviceList[i].deviceName,
             content:
               '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
-            offset: new AMap.Pixel(-15, -20),
+            offset: new AMap.Pixel(0, 0),
           });
-          
-          
+
+          // 信息窗体
+          let info = [];
+          info.push("<div style=\"text-align:left;border-bottom:1px solid #ccc;\"><h4>设备信息</h4>");
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">设备名称 : ${this.deviceList[i].deviceName}`);
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">设备详情 : ${this.deviceList[i].productCode}`);
+          info.push(`<p class='input-item' style=\"border-bottom:1px solid #ccc\">ip地址 : ${this.deviceList[i].deviceIp}  Mac地址 : ${this.deviceList[i].deviceMac}`);
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">地址 : ${this.deviceList[i].deviceAddress}`); 
+          let infoWindow = new AMap.InfoWindow({
+            content: info.join("")  //使用默认信息窗体框样式，显示信息内容
+          });
+
+          marker.on("click", (e) => {
+            infoWindow.open(this.map, e.target.getPosition());
+          });
           // 将创建的点标记添加到已有的地图实例：
           this.map.add([marker]);
-          // 信息窗体
-          // var infoWindow = new AMap.InfoWindow({
-          //   content: "提示信息",
-          // });
-          // marker.on("click", function () {
-          //   infoWindow.open(map, marker.getPosition());
-          // });
+
         }
       }
     },
@@ -179,6 +186,7 @@
 .circle-three {
   animation: transition-circle 2s infinite 1.4s;
 }
+
 .circle-three {
   animation: transition-circle 2s infinite 1.8s;
 }
@@ -189,11 +197,13 @@
     height: 0px;
     opacity: 1;
   }
+
   50% {
     width: 30px;
     height: 30px;
     opacity: 0.5;
   }
+
   100% {
     width: 35px;
     height: 35px;
diff --git a/src/components/mycomponent/dialog/snCodeRulsDialog.vue b/src/components/mycomponent/dialog/snCodeRulsDialog.vue
index eba7f1a..12124fc 100644
--- a/src/components/mycomponent/dialog/snCodeRulsDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeRulsDialog.vue
@@ -75,7 +75,8 @@
               {
                 digitItem: '',
                 digitPre: '',
-                digitItemIllustration: ''
+                digitItemIllustration: '',
+                digitPrelllustration:''
               }
 
             ]
@@ -116,7 +117,7 @@
           break
         }
         for (const code of rule.itemList) {
-          if (code.digitItem === '' || code.digitItemIllustration === '') {
+          if (code.digitItem === '' || code.digitItemIllustration === '' || code.digitPrelllustration == '') {
             message += `第${rindex + 1}项固定码中，编码项和编码说明不得为空！`
             flag = false
             break
@@ -190,7 +191,8 @@
               {
                 digitItem: '',
                 digitPre: '',
-                digitItemIllustration: ''
+                digitItemIllustration: '',
+                digitPrelllustration:'', // 前项编码说明
               }
 
             ]
@@ -208,7 +210,8 @@
           {
             digitItem: '', // 编码项
             digitPre: '', // 前项编码
-            digitItemIllustration: '' // 编码说明
+            digitItemIllustration: '', // 编码说明
+            digitPrelllustration:'', // 前项编码说明
           }
         ]
       })
diff --git a/src/components/mycomponent/snCode/codeField.vue b/src/components/mycomponent/snCode/codeField.vue
index 848f023..7ed5b88 100644
--- a/src/components/mycomponent/snCode/codeField.vue
+++ b/src/components/mycomponent/snCode/codeField.vue
@@ -140,7 +140,8 @@
       this.itemInfo.itemList.push({
         digitItem: '',
         digitPre: '',
-        digitItemIllustration: ''
+        digitItemIllustration: '',
+        digitPrelllustration:''
       })
     }
 
diff --git a/src/components/mycomponent/snCode/codeItem.vue b/src/components/mycomponent/snCode/codeItem.vue
index 633f10a..f193902 100644
--- a/src/components/mycomponent/snCode/codeItem.vue
+++ b/src/components/mycomponent/snCode/codeItem.vue
@@ -21,6 +21,9 @@
     <div class="CodeDesc code">
       <input-vue v-model="itemInfo.digitItemIllustration" title="编码说明" width="100px" size="small" :red-star="true" @submit="changeCodeinfo" />
     </div>
+    <div class="CodeDesc code">
+      <input-vue v-model="itemInfo.digitPrelllustration" title="前项编码说明" width="100px" size="small" :red-star="true" @submit="changeCodeinfo" />
+    </div>
     <div class="title_item">
       <i class="el-icon-top icon" @click="move('up')" />
       <i class="el-icon-bottom icon" @click="move('down')" />
@@ -59,7 +62,8 @@
       itemInfo: {
         digitItem: '',
         digitPre: '',
-        digitItemIllustration: ''
+        digitItemIllustration: '',
+        digitPrelllustration:''
       }
     }
   },

diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index a68977e..e921346 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -40,12 +40,12 @@
             zoom: 18, // 初始化地图级别
             center:
               this.deviceList.length > 0 &&
-              this.deviceList[0].lat &&
-              this.deviceList[0].lon
+                this.deviceList[0].lat &&
+                this.deviceList[0].lon
                 ? [
-                    Number(this.deviceList[0].lon),
-                    Number(this.deviceList[0].lat),
-                  ]
+                  Number(this.deviceList[0].lon),
+                  Number(this.deviceList[0].lat),
+                ]
                 : [116.4, 39.9],
             resizeEnable: true,
           });
@@ -69,19 +69,26 @@
             title: this.deviceList[i].deviceName,
             content:
               '<div class="circle-container"><div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
-            offset: new AMap.Pixel(-15, -20),
+            offset: new AMap.Pixel(0, 0),
           });
-          
-          
+
+          // 信息窗体
+          let info = [];
+          info.push("<div style=\"text-align:left;border-bottom:1px solid #ccc;\"><h4>设备信息</h4>");
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">设备名称 : ${this.deviceList[i].deviceName}`);
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">设备详情 : ${this.deviceList[i].productCode}`);
+          info.push(`<p class='input-item' style=\"border-bottom:1px solid #ccc\">ip地址 : ${this.deviceList[i].deviceIp}  Mac地址 : ${this.deviceList[i].deviceMac}`);
+          info.push(`<p  style=\"border-bottom:1px solid #ccc;\">地址 : ${this.deviceList[i].deviceAddress}`); 
+          let infoWindow = new AMap.InfoWindow({
+            content: info.join("")  //使用默认信息窗体框样式，显示信息内容
+          });
+
+          marker.on("click", (e) => {
+            infoWindow.open(this.map, e.target.getPosition());
+          });
           // 将创建的点标记添加到已有的地图实例：
           this.map.add([marker]);
-          // 信息窗体
-          // var infoWindow = new AMap.InfoWindow({
-          //   content: "提示信息",
-          // });
-          // marker.on("click", function () {
-          //   infoWindow.open(map, marker.getPosition());
-          // });
+
         }
       }
     },
@@ -179,6 +186,7 @@
 .circle-three {
   animation: transition-circle 2s infinite 1.4s;
 }
+
 .circle-three {
   animation: transition-circle 2s infinite 1.8s;
 }
@@ -189,11 +197,13 @@
     height: 0px;
     opacity: 1;
   }
+
   50% {
     width: 30px;
     height: 30px;
     opacity: 0.5;
   }
+
   100% {
     width: 35px;
     height: 35px;
diff --git a/src/components/mycomponent/dialog/snCodeRulsDialog.vue b/src/components/mycomponent/dialog/snCodeRulsDialog.vue
index eba7f1a..12124fc 100644
--- a/src/components/mycomponent/dialog/snCodeRulsDialog.vue
+++ b/src/components/mycomponent/dialog/snCodeRulsDialog.vue
@@ -75,7 +75,8 @@
               {
                 digitItem: '',
                 digitPre: '',
-                digitItemIllustration: ''
+                digitItemIllustration: '',
+                digitPrelllustration:''
               }
 
             ]
@@ -116,7 +117,7 @@
           break
         }
         for (const code of rule.itemList) {
-          if (code.digitItem === '' || code.digitItemIllustration === '') {
+          if (code.digitItem === '' || code.digitItemIllustration === '' || code.digitPrelllustration == '') {
             message += `第${rindex + 1}项固定码中，编码项和编码说明不得为空！`
             flag = false
             break
@@ -190,7 +191,8 @@
               {
                 digitItem: '',
                 digitPre: '',
-                digitItemIllustration: ''
+                digitItemIllustration: '',
+                digitPrelllustration:'', // 前项编码说明
               }
 
             ]
@@ -208,7 +210,8 @@
           {
             digitItem: '', // 编码项
             digitPre: '', // 前项编码
-            digitItemIllustration: '' // 编码说明
+            digitItemIllustration: '', // 编码说明
+            digitPrelllustration:'', // 前项编码说明
           }
         ]
       })
diff --git a/src/components/mycomponent/snCode/codeField.vue b/src/components/mycomponent/snCode/codeField.vue
index 848f023..7ed5b88 100644
--- a/src/components/mycomponent/snCode/codeField.vue
+++ b/src/components/mycomponent/snCode/codeField.vue
@@ -140,7 +140,8 @@
       this.itemInfo.itemList.push({
         digitItem: '',
         digitPre: '',
-        digitItemIllustration: ''
+        digitItemIllustration: '',
+        digitPrelllustration:''
       })
     }
 
diff --git a/src/components/mycomponent/snCode/codeItem.vue b/src/components/mycomponent/snCode/codeItem.vue
index 633f10a..f193902 100644
--- a/src/components/mycomponent/snCode/codeItem.vue
+++ b/src/components/mycomponent/snCode/codeItem.vue
@@ -21,6 +21,9 @@
     <div class="CodeDesc code">
       <input-vue v-model="itemInfo.digitItemIllustration" title="编码说明" width="100px" size="small" :red-star="true" @submit="changeCodeinfo" />
     </div>
+    <div class="CodeDesc code">
+      <input-vue v-model="itemInfo.digitPrelllustration" title="前项编码说明" width="100px" size="small" :red-star="true" @submit="changeCodeinfo" />
+    </div>
     <div class="title_item">
       <i class="el-icon-top icon" @click="move('up')" />
       <i class="el-icon-bottom icon" @click="move('down')" />
@@ -59,7 +62,8 @@
       itemInfo: {
         digitItem: '',
         digitPre: '',
-        digitItemIllustration: ''
+        digitItemIllustration: '',
+        digitPrelllustration:''
       }
     }
   },
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index 6919a6a..a38e95f 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -206,7 +206,7 @@
         </el-table>
       </div>
       <el-button @click="handleAddBtn">
-        添加项目需求
+        添加采购需求
       </el-button>
     </div>
     <div class="btnBox">