调整黑名单新增界面显示与作业管理地图中心位置

src/router/index.js

@@ -256,7 +256,7 @@ export const dynamicRoutes = [
         path: 'MapData',
         component: () => import('@/views/mes/dv/technology/technologyList/MapData'),
         name: 'MapData',
-        meta: { title: '设置隔离点', activeMenu: '/system/technology/technologyList/MapData' }
+        meta: { title: '设置隔离点', activeMenu: '/mes/dv/technology/technologyList/MapData' }
       }
     ]
   },

src/views/mes/blacklist/index.vue

@@ -128,10 +128,10 @@
     />
 
     <!-- 添加或修改设备维修单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1300px" append-to-body>
       <div>
-        <el-row :gutter="20">
-          <el-col :span="10">
+        <el-row :gutter="24">
+          <el-col :span="12">
             <!-- 穿梭框左边 -->
             <el-input v-model="searchQueryLeft" placeholder="请输入姓名" @input="searchQueryLeftInput" style="margin-bottom: 5px"></el-input>
             <el-table
@@ -168,29 +168,31 @@
             </el-table>
             <pagination v-show="totalLeft>0" :total="totalLeft" :page.sync="currentLeft" :limit.sync="sizeLeft" @pagination="getOtherList"/>
           </el-col>
-          <el-col :span="4" class="el-btn-dialog">
+          <el-col :span="2" class="el-btn-dialog">
             <el-button
               @click="right"
               type="primary"
               :disabled="nowSelectData.length ? false : true"
               icon="el-icon-arrow-right"
-            >加入右侧</el-button
+            ></el-button
             >
+            <br>
+
             <el-button
               @click="left"
               type="primary"
               :disabled="nowSelectRightData.length ? false : true"
               icon="el-icon-arrow-left"
               style="margin-left: 0;margin-top: 10px;"
-            >加入左侧</el-button
+            ></el-button
             >
           </el-col>
-          <el-col :span="10">
+          <el-col :span="9">
             <!-- 穿梭框右边 -->
             <el-table
               ref="multipleTable"
               :data="tableData2"
-              height="500"
+              height="540"
               tooltip-effect="dark"
               style="width: 100%"
               @select="checkRight"

src/views/mes/dv/technology/technologyDetail/DeviceDetail.vue

@@ -269,7 +269,7 @@ export default {
       console.log(row, "row预览");
       const data = row.lotoId;
       this.$router.push(
-        `/system/technology/technologyList/index/MapData?lotoId=${data}&machineryId=${row.machineryId}`
+        `/mes/dv/technology/technologyList/index/MapData?lotoId=${data}&machineryId=${row.machineryId}`
       );
       // this.dialogVisibleMap = true; // 显示地图预览弹框
     },

src/views/mes/job/jobm/NewMarsJob.vue

@@ -23,6 +23,7 @@
           width: '1250px',
           height: '700px',
           position: 'relative',
+
         }"
       >
         <img
@@ -34,28 +35,34 @@
           v-for="(ticket, index) in TicketListPage"
           :key="ticket.ticketId"
           :style="{
-            width: '35px',
-            cursor: 'pointer',
-            height: '35px',
-            position: 'absolute',
-            top: '220px',
-            left: `${481 + 40 * index}px`,
-          }"
+    width: '35px',
+    height: '35px',
+    position: 'absolute',
+    cursor: 'pointer',
+    // 图标垂直居中
+    top: `${deptXLGCenter.top - 53}px`,
+    // 图标水平居中，动态计算偏移
+    left: `${deptXLGCenter.left - (TicketListPage.length * 35 + (TicketListPage.length - 1) * 5) / 2 + index * 40}px`,
+  }"
           :src="require('@/assets/images/marsPoint.png')"
           alt=""
           @click="handleTicketClick(ticket)"
         />
+
+        <!-- deptCCO 区域的图标 -->
         <img
           v-for="(ticket, index) in COCOTicketListPage"
           :key="ticket.ticketId"
           :style="{
-            width: '35px',
-            cursor: 'pointer',
-            height: '35px',
-            position: 'absolute',
-            top: '440px',
-            left: `${650 + 40 * index}px`,
-          }"
+    width: '35px',
+    height: '35px',
+    position: 'absolute',
+    cursor: 'pointer',
+    // 图标垂直居中
+    top: `${deptCCOCenter.top - 53}px`,
+    // 图标水平居中，动态计算偏移
+    left: `${deptCCOCenter.left - (COCOTicketListPage.length * 35 + (COCOTicketListPage.length - 1) * 5) / 2 + index * 40}px`,
+  }"
           :src="require('@/assets/images/marsPoint.png')"
           alt=""
           @click="handleTicketClick(ticket)"
@@ -667,54 +674,54 @@
 
     <!--    锁定站放大按钮呈现diaolog-->
     <el-dialog :visible.sync="LockDetailvisible" title="锁定站信息" height="500px" width="1200px" append-to-body>
-<!--      这里为了没有地图数据而设置的-->
-<!--      <el-row>-->
-<!--        <el-col :span="8">-->
-<!--          <div style="padding: 10px">-->
-<!--            <el-table :data="selectPointList" :show-header="false" style="width: 200px;height: 175px;margin-left: 15%">-->
-<!--              <el-table-column-->
-<!--                prop="pointName"-->
-<!--                label=""-->
-<!--              ></el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="remark"-->
-<!--                label=""-->
-<!--              ></el-table-column>-->
-<!--            </el-table>-->
-<!--          </div>-->
-<!--        </el-col>-->
-<!--        <el-col :span="8">-->
-<!--          <LockDetail-->
-<!--            style=" margin-left: 5%"-->
-<!--            :machineryId="this.machineryId"-->
-<!--          ></LockDetail>-->
-<!--        </el-col>-->
-<!--        <el-col :span="8">-->
-<!--          <div style="padding: 10px"></div>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
+      <!--      这里为了没有地图数据而设置的-->
+      <!--      <el-row>-->
+      <!--        <el-col :span="8">-->
+      <!--          <div style="padding: 10px">-->
+      <!--            <el-table :data="selectPointList" :show-header="false" style="width: 200px;height: 175px;margin-left: 15%">-->
+      <!--              <el-table-column-->
+      <!--                prop="pointName"-->
+      <!--                label=""-->
+      <!--              ></el-table-column>-->
+      <!--              <el-table-column-->
+      <!--                prop="remark"-->
+      <!--                label=""-->
+      <!--              ></el-table-column>-->
+      <!--            </el-table>-->
+      <!--          </div>-->
+      <!--        </el-col>-->
+      <!--        <el-col :span="8">-->
+      <!--          <LockDetail-->
+      <!--            style=" margin-left: 5%"-->
+      <!--            :machineryId="this.machineryId"-->
+      <!--          ></LockDetail>-->
+      <!--        </el-col>-->
+      <!--        <el-col :span="8">-->
+      <!--          <div style="padding: 10px"></div>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
 
-            <el-row>
-              <el-col :span="8">
-                <LockDetail
-                  style="width: 300px; height: 520px; margin-left: 5%"
-                  :machineryId="this.machineryId"
-                ></LockDetail>
-                <el-table :data="selectPointList" :show-header="false"  style="width: 200px;height: 175px;margin-left: 15%">
-                  <el-table-column
-                    prop="pointName"
-                    label=""
-                  ></el-table-column>
-                  <el-table-column
-                    prop="remark"
-                    label=""
-                  ></el-table-column>
-                </el-table>
-              </el-col>
-              <el-col :span="16">
-                <img src="@/assets/images/sopbgimg.png" style="width: 100%;height:100%;"/>
-              </el-col>
-            </el-row>
+      <el-row>
+        <el-col :span="8">
+          <LockDetail
+            style="width: 300px; height: 520px; margin-left: 5%"
+            :machineryId="this.machineryId"
+          ></LockDetail>
+          <el-table :data="selectPointList" :show-header="false" style="width: 200px;height: 175px;margin-left: 15%">
+            <el-table-column
+              prop="pointName"
+              label=""
+            ></el-table-column>
+            <el-table-column
+              prop="remark"
+              label=""
+            ></el-table-column>
+          </el-table>
+        </el-col>
+        <el-col :span="16">
+          <img src="@/assets/images/sopbgimg.png" style="width: 100%;height:100%;"/>
+        </el-col>
+      </el-row>
     </el-dialog>
 
   </div>
@@ -801,7 +808,19 @@ export default {
         ]
       },
       tableVisible: true,//表格显示
-      LockDetailvisible: false//锁定站详情
+      LockDetailvisible: false,//锁定站详情'
+      deptXLGPosition: {
+        left: 500,
+        top: 260,
+        width: 65,
+        height: 25
+      },
+      deptCCOPosition: {
+        left: 670,
+        top: 480,
+        width: 65,
+        height: 25
+      }
     }
 
   },
@@ -817,6 +836,18 @@ export default {
     isStepFourExecuted() {
       const stepFour = this.EightStepForm.find((step) => step.stepIndex == '4')
       return stepFour && stepFour.stepStatus === '1'
+    },
+    deptXLGCenter() {
+      return {
+        left: this.deptXLGPosition.left + this.deptXLGPosition.width / 2,
+        top: this.deptXLGPosition.top + this.deptXLGPosition.height / 2
+      }
+    },
+    deptCCOCenter() {
+      return {
+        left: this.deptCCOPosition.left + this.deptCCOPosition.width / 2,
+        top: this.deptCCOPosition.top + this.deptCCOPosition.height / 2
+      }
     }
   },
   watch: {