diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js
index 87edffbe..23c3bdde 100644
--- a/src/api/MarketingCenter/ContractInformationManagement.js
+++ b/src/api/MarketingCenter/ContractInformationManagement.js
@@ -34,9 +34,8 @@ export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '合同信息管理_合同信息_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&客户名称_check=' + num11 + '=int&客户名称=' + num12 + '=string',
-      Pagination: pageCurrent + '&' + pageSize
+      name: '合同信息管理_合同信息_查询_分页',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&客户名称_check=' + num11 + '=int&客户名称=' + num12 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }
diff --git a/src/assets/img/StationLayout.jpg b/src/assets/img/StationLayout.jpg
index 5185b9a0..007f4b45 100644
Binary files a/src/assets/img/StationLayout.jpg and b/src/assets/img/StationLayout.jpg differ
diff --git a/src/assets/img/StationLayout.psd b/src/assets/img/StationLayout.psd
index b05addcc..2f5a3fbe 100644
Binary files a/src/assets/img/StationLayout.psd and b/src/assets/img/StationLayout.psd differ
diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
index eec39480..43153eb3 100644
--- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
@@ -84,7 +84,7 @@
         </el-tooltip>
         <el-tooltip :enterable="false" :id="OPNAME136" placement="top" @mouseover.native.prevent="changeActive($event)">
           <div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
-          <div :id="OPNAME136" :title="tooltip" style="position: relative;left:159px;top:395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
+          <div :id="OPNAME136" :title="tooltip" style="position: relative;left:199px;top:395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
             <el-row>
               <!--<div :id="OPNAME136+fang" class="fang"/>-->
               <div :id="OPNAME136+circle" class="circle" style="margin-left: 11px;"/>
@@ -504,31 +504,31 @@
         </el-tooltip>
         <el-tooltip :enterable="false" :id="OPNAME146" placement="top" @mouseover.native.prevent="changeActive($event)">
           <div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
-          <div :id="OPNAME146" :title="tooltip" style="position: relative;left:1460px;top:-1167px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
+          <div :id="OPNAME146" :title="tooltip" style="position: relative;left:1450px;top:-1167px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
             <el-row>
               <!--<div :id="OPNAME135+fang" class="fang"/>-->
-              <!--<div :id="OPNAME146+circle" class="circle" style="margin-left: 13px"/>-->
+              <div :id="OPNAME146+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">{{ OPNAME146 }}</div>
             </el-row>
           </div>
         </el-tooltip>
         <el-tooltip :enterable="false" :id="OPNAME148" placement="top" @mouseover.native.prevent="changeActive($event)">
           <div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
-          <div :id="OPNAME148" :title="tooltip" style="position: relative;left:1578px;top:-1195px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
+          <div :id="OPNAME148" :title="tooltip" style="position: relative;left:1568px;top:-1195px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
             <el-row>
               <!--<div :id="OPNAME135+fang" class="fang"/>-->
-              <!--<div :id="OPNAME148+circle" class="circle" style="margin-left: 13px"/>-->
+              <div :id="OPNAME148+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">{{ OPNAME148 }}</div>
             </el-row>
           </div>
         </el-tooltip>
         <el-tooltip :enterable="false" :id="OPNAME147" placement="top" @mouseover.native.prevent="changeActive($event)">
           <div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
-          <div :title="tooltip" style="position: relative;left:1346px;top:-548px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
+          <div :title="tooltip" style="position: relative;left:1330px;top:-660px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
             <el-row>
               <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME147 }}</div>
               <!--<div :id="OPNAME147+circle" class="circle"/>-->
-              <!--<div :id="OPNAME117+fang" class="fang" style="margin-left: 9px"/>-->
+              <div :id="OPNAME147+circle" class="circle" style="margin-left: 4px"/>
             </el-row>
           </div>
         </el-tooltip>
@@ -553,6 +553,9 @@
           </div>
         </div>
       </div>
+      <div style="position: absolute;margin-top: -825px;margin-left: 20px;height: 30px;width: 120px;font-weight: bold;font-size: 20px;color: black;z-index: 999;">
+        {{ nowdate }}
+      </div>
       <!--      <el-card style="position: absolute;background: #ffffff;margin-top: -825px;margin-left: 1540px;height: 130px;width: 120px">-->
       <!--        <div style="margin-top: 6px">-->
       <!--          <div class="circle4" style="margin-top: 3px"/>-->
@@ -642,9 +645,10 @@ export default {
       tooltip1: '',
       tooltip2: '',
       tooltip3: '',
+      nowdate: '',
       socketConnect: true,
-      机床总装: '机床总装',
-      部件装配: '部件装配',
+      机床总装: '总装机床',
+      部件装配: '装配部件',
       OPNAME101: 'OP1010',
       OPNAME102: 'OP1020',
       OPNAME103: 'OP1030',
@@ -713,6 +717,16 @@ export default {
     }
   },
   mounted() {
+    // 获取时间
+    var date = new Date()
+    var y = date.getFullYear()
+    var m = date.getMonth() + 1
+    m = m < 10 ? '0' + m : m
+    var d = date.getDate()
+    d = d < 10 ? ('0' + d) : d
+    var time1 = y + '-' + m + '-' + d
+    this.nowdate = time1
+    // 获取时间
     this.connect()
     // this.getwork_state()
     this.getOP_state()
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 5601ff9d..574cd85f 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -765,7 +765,12 @@ export default {
       this.uploader = false
       this.ExecutionProgress = null
       this.listLoading = true
-      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.check1, this.check1, this.dateRange[0], this.dateRange[1], this.machine_check, this.machine, this.customerName1_check, this.customerName1], ['tableData1', 'total', 'listLoading'])
+      searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.check1, this.check1, this.dateRange[0], this.dateRange[1], this.machine_check, this.machine, this.customerName1_check, this.customerName1).then(response => {
+        console.log(response.data)
+        this.listLoading = false
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.tableData1 = response.data.result
+      })
     },
     exportExcel() {
       if (this.customerName1 === '' || this.customerName1 === null) { this.customerName1_check = 0 } else { this.customerName1_check = 1 }