diff --git a/src/assets/img/img23.png b/src/assets/img/img23.png
new file mode 100644
index 00000000..0afa04b7
Binary files /dev/null and b/src/assets/img/img23.png differ
diff --git a/src/assets/img/img24.png b/src/assets/img/img24.png
new file mode 100644
index 00000000..31643022
Binary files /dev/null and b/src/assets/img/img24.png differ
diff --git a/src/utils/request.js b/src/utils/request.js
index f61bf8ab..25262f70 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,6 +3,7 @@ import axios from 'axios'
 export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket`
 export const name = `OP8888`
 export const name1 = `OP1000`
+export const name3 = `OP2000`
 
 // 创建axios实例
 export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice
diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
index e2493725..b24f58e7 100644
--- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
@@ -1,310 +1,310 @@
 <template>
   <el-card>
     <div class="process">
-      <div :id="OPNAME137" :title="tooltip" style="position: relative;left:39px;top:375px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)" >
+      <div style="position: relative;left:48px;top:375px; width: 100px;height: 28px;" >
         <el-row>
-          <div :id="OPNAME137+fang" class="fang"/>
+          <!--<div :id="OPNAME137+fang" class="fang"/>-->
           <div :id="OPNAME137+circle" class="circle" style="margin-left: 11px;"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME137 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME138" :title="tooltip" style="position: relative;left:39px;top:382px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div style="position: relative;left:48px;top:382px; width: 100px;height: 28px;">
         <el-row>
-          <div :id="OPNAME138+fang" class="fang"/>
+          <!--<div :id="OPNAME138+fang" class="fang"/>-->
           <div :id="OPNAME138+circle" class="circle" style="margin-left: 11px;"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME138 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME139" :title="tooltip" style="position: relative;left:39px;top:389px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div style="position: relative;left:48px;top:389px; width: 100px;height: 28px;">
         <el-row>
-          <div :id="OPNAME139+fang" class="fang"/>
+          <!--<div :id="OPNAME139+fang" class="fang"/>-->
           <div :id="OPNAME139+circle" class="circle" style="margin-left: 11px;"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME139 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME140" :title="tooltip" style="position: relative;left:39px;top:396px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME140" :title="tooltip" style="position: relative;left:48px;top:396px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME140+fang" class="fang"/>
+          <!--<div :id="OPNAME140+fang" class="fang"/>-->
           <div :id="OPNAME140+circle" class="circle" style="margin-left: 11px;"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME140 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME141" :title="tooltip" style="position: relative;left:39px;top:403px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME141" :title="tooltip" style="position: relative;left:48px;top:403px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME141+fang" class="fang"/>
+          <!--<div :id="OPNAME141+fang" class="fang"/>-->
           <div :id="OPNAME141+circle" class="circle" style="margin-left: 11px;"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME141 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME142" :title="tooltip" style="position: relative;left:39px;top:410px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME142" :title="tooltip" style="position: relative;left:48px;top:410px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME142+fang" class="fang"/>
+          <!--<div :id="OPNAME142+fang" class="fang"/>-->
           <div :id="OPNAME142+circle" class="circle" style="margin-left: 11px;"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME142 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME143" :title="tooltip" style="position: relative;left:39px;top:417px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME143" :title="tooltip" style="position: relative;left:48px;top:417px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME143+fang" class="fang"/>
+          <!--<div :id="OPNAME143+fang" class="fang"/>-->
           <div :id="OPNAME143+circle" class="circle" style="margin-left: 11px;"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME143 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME144" :title="tooltip" style="position: relative;left:39px;top:424px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME144" :title="tooltip" style="position: relative;left:48px;top:424px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME144+fang" class="fang"/>
+          <!--<div :id="OPNAME144+fang" class="fang"/>-->
           <div :id="OPNAME144+circle" class="circle" style="margin-left: 11px;"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME144 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME136" :title="tooltip" style="position: relative;left:140px;top:395px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME136" :title="tooltip" style="position: relative;left:149px;top:395px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME136+fang" class="fang"/>
+          <!--<div :id="OPNAME136+fang" class="fang"/>-->
           <div :id="OPNAME136+circle" class="circle" style="margin-left: 11px;"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME136 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME101" :title="tooltip" style="position: relative;left:788px;top:25px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME101" :title="tooltip" style="position: relative;left:788px;top:25px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME101 }}</div>
           <div :id="OPNAME101+circle" class="circle"/>
-          <div :id="OPNAME101+fang" class="fang" style="margin-left: 9px"/>
+          <!--<div :id="OPNAME101+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME102" :title="tooltip" style="position: relative;left:788px;top:48px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME102" :title="tooltip" style="position: relative;left:788px;top:48px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME102 }}</div>
           <div :id="OPNAME102+circle" class="circle"/>
-          <div :id="OPNAME102+fang" class="fang" style="margin-left: 9px"/>
+          <!--<div :id="OPNAME102+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME103" :title="tooltip" style="position: relative;left:788px;top:64px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME103" :title="tooltip" style="position: relative;left:788px;top:64px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME103 }}</div>
           <div :id="OPNAME103+circle" class="circle"/>
-          <div :id="OPNAME103+fang" class="fang" style="margin-left: 9px"/>
+          <!--<div :id="OPNAME103+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME104" :title="tooltip" style="position: relative;left:788px;top:60px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME104" :title="tooltip" style="position: relative;left:788px;top:60px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME104 }}</div>
           <div :id="OPNAME104+circle" class="circle"/>
-          <div :id="OPNAME104+fang" class="fang" style="margin-left: 9px"/>
+          <!--<div :id="OPNAME104+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME105" :title="tooltip" style="position: relative;left:892px;top:76px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME105" :title="tooltip" style="position: relative;left:902px;top:76px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME105+fang" class="fang"/>
+          <!--<div :id="OPNAME105+fang" class="fang"/>-->
           <div :id="OPNAME105+circle" class="circle" style="margin-left: 9px"/>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME105 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME106" :title="tooltip" style="position: relative;left:788px;top:48px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME106" :title="tooltip" style="position: relative;left:788px;top:48px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME106 }}</div>
           <div :id="OPNAME106+circle" class="circle"/>
-          <div :id="OPNAME106+fang" class="fang" style="margin-left: 9px"/>
+          <!--<div :id="OPNAME106+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME107" :title="tooltip" style="position: relative;left:788px;top:43px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME107" :title="tooltip" style="position: relative;left:788px;top:43px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME107 }}</div>
           <div :id="OPNAME107+circle" class="circle"/>
-          <div :id="OPNAME107+fang" class="fang" style="margin-left: 9px"/>
+          <!--<div :id="OPNAME107+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME108" :title="tooltip" style="position: relative;left:788px;top:38px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME108" :title="tooltip" style="position: relative;left:788px;top:38px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME108 }}</div>
           <div :id="OPNAME108+circle" class="circle"/>
-          <div :id="OPNAME108+fang" class="fang" style="margin-left: 9px"/>
+          <!--<div :id="OPNAME108+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME109" :title="tooltip" style="position: relative;left:788px;top:32px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME109" :title="tooltip" style="position: relative;left:788px;top:32px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME109 }}</div>
           <div :id="OPNAME109+circle" class="circle"/>
-          <div :id="OPNAME109+fang" class="fang" style="margin-left: 9px"/>
+          <!--<div :id="OPNAME109+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME110" :title="tooltip" style="position: relative;left:788px;top:27px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME110" :title="tooltip" style="position: relative;left:788px;top:27px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME110 }}</div>
           <div :id="OPNAME110+circle" class="circle"/>
-          <div :id="OPNAME110+fang" class="fang" style="margin-left: 9px"/>
+          <!--<div :id="OPNAME110+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME111" :title="tooltip" style="position: relative;left:788px;top:21px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME111" :title="tooltip" style="position: relative;left:788px;top:21px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME111 }}</div>
           <div :id="OPNAME111+circle" class="circle"/>
-          <div :id="OPNAME111+fang" class="fang" style="margin-left: 9px"/>
+          <!--<div :id="OPNAME111+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME112" :title="tooltip" style="position: relative;left:788px;top:15px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME112" :title="tooltip" style="position: relative;left:788px;top:15px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME112 }}</div>
           <div :id="OPNAME112+circle" class="circle"/>
-          <div :id="OPNAME112+fang" class="fang" style="margin-left: 9px"/>
+          <!--<div :id="OPNAME112+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME113" :title="tooltip" style="position: relative;left:889px;top:-300px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME113" :title="tooltip" style="position: relative;left:889px;top:-300px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME113 }}</div>
           <div :id="OPNAME113+circle" class="circle"/>
-          <div :id="OPNAME113+fang" class="fang" style="margin-left: 12px"/>
+          <!--<div :id="OPNAME113+fang" class="fang" style="margin-left: 12px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME114" :title="tooltip" style="position: relative;left:889px;top:-245px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME114" :title="tooltip" style="position: relative;left:889px;top:-245px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME114 }}</div>
           <div :id="OPNAME114+circle" class="circle"/>
-          <div :id="OPNAME114+fang" class="fang" style="margin-left: 12px"/>
+          <!--<div :id="OPNAME114+fang" class="fang" style="margin-left: 12px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME115" :title="tooltip" style="position: relative;left:895px;top:-163px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME115" :title="tooltip" style="position: relative;left:895px;top:-163px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME115 }}</div>
           <div :id="OPNAME115+circle" class="circle"/>
-          <div :id="OPNAME115+fang" class="fang" style="margin-left: 9px"/>
+          <!--<div :id="OPNAME115+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME116" :title="tooltip" style="position: relative;left:895px;top:-128px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME116" :title="tooltip" style="position: relative;left:895px;top:-128px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME116 }}</div>
           <div :id="OPNAME116+circle" class="circle"/>
-          <div :id="OPNAME116+fang" class="fang" style="margin-left: 9px"/>
+          <!--<div :id="OPNAME116+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME117" :title="tooltip" style="position: relative;left:895px;top:-124px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME117" :title="tooltip" style="position: relative;left:895px;top:-124px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
           <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME117 }}</div>
-          <div :id="OPNAME117+circle"class="circle"/>
-          <div :id="OPNAME117+fang" class="fang" style="margin-left: 9px"/>
+          <div :id="OPNAME117+circle" class="circle"/>
+          <!--<div :id="OPNAME117+fang" class="fang" style="margin-left: 9px"/>-->
         </el-row>
       </div>
-      <div :id="OPNAME118" :title="tooltip" style="position: relative;left:1022px;top:-326px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME118" :title="tooltip" style="position: relative;left:1032px;top:-326px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME118+fang" class="fang"/>
+          <!--<div :id="OPNAME118+fang" class="fang"/>-->
           <div :id="OPNAME118+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME118 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME119" :title="tooltip" style="position: relative;left:1022px;top:-311px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME119" :title="tooltip" style="position: relative;left:1032px;top:-311px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME119+fang" class="fang"/>
+          <!--<div :id="OPNAME119+fang" class="fang"/>-->
           <div :id="OPNAME119+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME119 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME120" :title="tooltip" style="position: relative;left:1022px;top:-295px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME120" :title="tooltip" style="position: relative;left:1032px;top:-295px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME120+fang" class="fang"/>
+          <!--<div :id="OPNAME120+fang" class="fang"/>-->
           <div :id="OPNAME120+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME120 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME121" :title="tooltip" style="position: relative;left:1020px;top:-190px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME121" :title="tooltip" style="position: relative;left:1032px;top:-190px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME121+fang" class="fang"/>
+          <!--<div :id="OPNAME121+fang" class="fang"/>-->
           <div :id="OPNAME121+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME121 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME122" :title="tooltip" style="position: relative;left:1020px;top:-120px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME122" :title="tooltip" style="position: relative;left:1032px;top:-120px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME122+fang" class="fang"/>
+          <!--<div :id="OPNAME122+fang" class="fang"/>-->
           <div :id="OPNAME122+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME122 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME123" :title="tooltip" style="position: relative;left:1118px;top:-585px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME123" :title="tooltip" style="position: relative;left:1128px;top:-585px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME123+fang" class="fang"/>
+          <!--<div :id="OPNAME123+fang" class="fang"/>-->
           <div :id="OPNAME123+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME123 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME124" :title="tooltip" style="position: relative;left:1118px;top:-568px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME124" :title="tooltip" style="position: relative;left:1128px;top:-568px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME124+fang" class="fang"/>
+          <!--<div :id="OPNAME124+fang" class="fang"/>-->
           <div :id="OPNAME124+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME124 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME125" :title="tooltip" style="position: relative;left:1118px;top:-553px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME125" :title="tooltip" style="position: relative;left:1128px;top:-553px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME125+fang" class="fang"/>
+          <!--<div :id="OPNAME125+fang" class="fang"/>-->
           <div :id="OPNAME125+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME125 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME126" :title="tooltip" style="position: relative;left:1118px;top:-537px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME126" :title="tooltip" style="position: relative;left:1128px;top:-537px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME126+fang" class="fang"/>
+          <!--<div :id="OPNAME126+fang" class="fang"/>-->
           <div :id="OPNAME126+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME126 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME127" :title="tooltip" style="position: relative;left:1124px;top:-341px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME127" :title="tooltip" style="position: relative;left:1128px;top:-341px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME127+fang" class="fang"/>
+          <!--<div :id="OPNAME127+fang" class="fang"/>-->
           <div :id="OPNAME127+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME127 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME128" :title="tooltip" style="position: relative;left:1120px;top:-319px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME128" :title="tooltip" style="position: relative;left:1128px;top:-319px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME128+fang" class="fang"/>
+          <!--<div :id="OPNAME128+fang" class="fang"/>-->
           <div :id="OPNAME128+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME128 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME129" :title="tooltip" style="position: relative;left:1270px;top:-769px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME129" :title="tooltip" style="position: relative;left:1280px;top:-769px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME129+fang" class="fang"/>
-          <div :id="OPNAME129+circle"class="circle" style="margin-left: 13px"/>
+          <!--<div :id="OPNAME129+fang" class="fang"/>-->
+          <div :id="OPNAME129+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME129 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME130" :title="tooltip" style="position: relative;left:1270px;top:-759px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME130" :title="tooltip" style="position: relative;left:1280px;top:-759px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME130+fang" class="fang"/>
+          <!--<div :id="OPNAME130+fang" class="fang"/>-->
           <div :id="OPNAME130+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME130 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME131" :title="tooltip" style="position: relative;left:1270px;top:-719px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME131" :title="tooltip" style="position: relative;left:1280px;top:-719px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME131+fang" class="fang"/>
+          <!--<div :id="OPNAME131+fang" class="fang"/>-->
           <div :id="OPNAME131+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME131 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME132" :title="tooltip" style="position: relative;left:1270px;top:-649px; width: 100px;height: 28px;"@mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
+      <div :id="OPNAME132" :title="tooltip" style="position: relative;left:1280px;top:-649px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME132+fang" class="fang"/>
+          <!--<div :id="OPNAME132+fang" class="fang"/>-->
           <div :id="OPNAME132+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME132 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME133" :title="tooltip" style="position: relative;left:1273px;top:-640px; width: 100px;height: 28px;">
+      <div :id="OPNAME133" :title="tooltip" style="position: relative;left:1283px;top:-640px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME133+fang" class="fang"/>
+          <!--<div :id="OPNAME133+fang" class="fang"/>-->
           <div :id="OPNAME133+circle" class="circle" style="margin-left: 10px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME133 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME134" :title="tooltip" style="position: relative;left:1270px;top:-545px; width: 100px;height: 28px;">
+      <div :id="OPNAME134" :title="tooltip" style="position: relative;left:1280px;top:-545px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME134+fang" class="fang"/>
+          <!--<div :id="OPNAME134+fang" class="fang"/>-->
           <div :id="OPNAME134+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME134 }}</div>
         </el-row>
       </div>
-      <div :id="OPNAME135" :title="tooltip" style="position: relative;left:1270px;top:-535px; width: 100px;height: 28px;">
+      <div :id="OPNAME135" :title="tooltip" style="position: relative;left:1280px;top:-535px; width: 100px;height: 28px;" @mouseover="changeActive($event)" @mouseout="removeActive($event)" @click="opclickshowPanel($event)">
         <el-row>
-          <div :id="OPNAME135+fang" class="fang"/>
+          <!--<div :id="OPNAME135+fang" class="fang"/>-->
           <div :id="OPNAME135+circle" class="circle" style="margin-left: 13px"/>
           <div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME135 }}</div>
         </el-row>
@@ -322,7 +322,7 @@ export default {
     return {
       fang: '_fang',
       circle: '_circle',
-      tooltip: '787878',
+      tooltip: '',
       socketConnect: true,
       OPNAME101: 'OP1010',
       OPNAME102: 'OP1020',
@@ -396,6 +396,7 @@ export default {
       // }
 
       getwork_state().then(response => {
+        console.log(response.data)
         // 通过jQuery添加类选择器和移除类选择器
         for (let i = 0; i < response.data.length; i++) {
           // 点击工位事件
@@ -403,19 +404,18 @@ export default {
           // document.getElementById(response.data[i].设备号).onclick = _this.opclickshowPanel(); //鼠标单击的时候调用showMes这个函数
           // $('#' + response.data[i].设备号).bind('click', opclickshowPanel)
           if (response.data[i].设备状态 === '1') {
-            $('#' + response.data[i].设备号 + '_fang').removeClass('fang')
-            $('#' + response.data[i].设备号 + '_fang').addClass('fang1')
-          } else if (response.data[i].设备状态 === '0') {
             $('#' + response.data[i].设备号 + '_fang').removeClass('fang1')
             $('#' + response.data[i].设备号 + '_fang').addClass('fang')
+          } else if (response.data[i].设备状态 === '0') {
+            $('#' + response.data[i].设备号 + '_fang').removeClass('fang')
+            $('#' + response.data[i].设备号 + '_fang').addClass('fang1')
           }
         }
       })
     },
-     opclickshowPanel($event) {
-      if($event.path[2].id!=undefined && $event.path[2].id!==null &&$event.path[2].id!=='')
-      {
-        var aaa = 'http://localhost:8065/webpage/MesWebFun02.htm?opname=' + $event.path[2].id + '&ip=192.168.1.103&port=8015'
+    opclickshowPanel($event) {
+      if ($event.path[2].id !== undefined && $event.path[2].id !== null && $event.path[2].id !== '') {
+        var aaa = 'http://192.168.1.232/webpage/MesWebFun02.htm?opname=' + $event.path[2].id + '&ip=192.168.1.231&port=61101'
         window.open(aaa)
       }
     },
@@ -451,11 +451,14 @@ export default {
     // 鼠标移入加入class
     changeActive($event) {
       searchtooltip($event.path[2].id).then(response => {
+        console.log(response.data)
         if (response.data.length > 0) {
-          if (response.data[0].工艺计划流水号 == 0) {
-            response.data[0].工艺计划流水号 = null
+          if (response.data[0].工艺计划流水号 === 0) {
+            response.data[0].零件图号_零件工艺计划 = '-'
           }
-          this.tooltip = '当前零件图号:' + response.data[0].工艺计划流水号
+          this.tooltip = '当前正在加工:' + response.data[0].零件图号_零件工艺计划
+        } else {
+          this.tooltip = '没有零件加工'
         }
       })
       // $event.currentTarget.className="active";
@@ -463,10 +466,6 @@ export default {
     removeActive($event) {
       // $event.currentTarget.className="";
     },
-    tooltipselect() {
-      console.log(76576576)
-      this.tooltip = '7867564657676754'
-    },
     /* socket连接*/
     connect() {
       if (this.socketConnect === true) {
@@ -492,23 +491,24 @@ export default {
       this.msg = msg.data
       // console.log(msg)
       var msgArray = this.msg.split('|')
-      if (msgArray != '' && msgArray.length >= 4) {
+      if (msgArray !== '' && msgArray.length >= 4) {
         var command = msgArray[1]
         var opname = msgArray[2]
         var value = msgArray[3]
         switch (command) {
           case 'MachineStatusAlarm':// hight 报错不管心跳
           case 'Alarm':
-            if (value == 1) {
-
+            if (value === 1) {
+              console.log(1)
             } else {
+              console.log(2)
             }
             break
           case 'PartPalletStatus':// 托盘到位
-            if (value == 1) {
-
+            if (value === 1) {
+              console.log(1)
             } else {
-
+              console.log(2)
             }
             break
           case 'OEE':// 托盘到位
@@ -562,7 +562,7 @@ export default {
     width: 1690px;
     height: 830px;
     /*border: 1px solid red;*/
-    background: url('../../../assets/img/img22.png') repeat;
+    background: url('../../../assets/img/img24.png') repeat;
     background-repeat:no-repeat;
     background-size:100% 100%;-moz-background-size:100% 100%;
   }
diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue
index 54e6eb8c..412eae92 100644
--- a/src/views/ManufacturingCenter/ParseQuery/index.vue
+++ b/src/views/ManufacturingCenter/ParseQuery/index.vue
@@ -4431,7 +4431,7 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: `select * from 综合查询_发货_查询视图 where 机床流水号 = 10`
+          name: `select * from 综合查询_发货_查询视图 where 机床流水号 = ${this.machineValue1}`
         }
       }).then(res => {
         this.tableDataDiv23 = res.data