修改分配人员与锁定站字体

src/components/separationPoint/index.vue

@@ -362,7 +362,7 @@ export default {
           const text = new Konva.Text({
             x: x + 8,
             y: y + 50,
-            fontSize: 20,
+            fontSize: 18,
             text: labelText,
             fontFamily: 'Calibri',
             fill: 'red'

src/components/separationPoint/index1.vue

@@ -276,7 +276,7 @@ export default {
           const text = new Konva.Text({
             x: x + 12,
             y: y + 60,
-            fontSize: 20,
+            fontSize: 18,
             text: labelText,
             fontFamily: 'Calibri',
             fill: 'red'

src/views/mes/hw/lotoStation/MapData.vue

@@ -290,7 +290,7 @@ export default {
           const text = new Konva.Text({
             x: x + 8,
             y: y + 50,
-            fontSize: 20,
+            fontSize: 18,
             text: labelText,
             fontFamily: 'Calibri',
             fill: 'red'

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

@@ -422,20 +422,20 @@
                     }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="80">
-                <template slot-scope="scope">
-                  <el-button
-                    v-no-more-click
-                    @click.native.prevent="
-                      deleteRow(scope.$index, AllUserTable)
-                    "
-                    type="text"
-                    size="small"
-                  >
-                    移除
-                  </el-button>
-                </template>
-              </el-table-column>
+<!--              <el-table-column label="操作" width="80">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <el-button-->
+<!--                    v-no-more-click-->
+<!--                    @click.native.prevent="-->
+<!--                      deleteRow(scope.$index, AllUserTable)-->
+<!--                    "-->
+<!--                    type="text"-->
+<!--                    size="small"-->
+<!--                  >-->
+<!--                    移除-->
+<!--                  </el-button>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
             </el-table>
           </el-col>
         </el-row>
@@ -944,7 +944,7 @@ export default {
       if (row.stepIndex == '3') {
         this.dialogForm.locker=''
         this.AllUserTable=[]
-       this.newticketUserDTOList=[]
+        this.newticketUserDTOList=[]
         this.open = true
 
         const query = {
@@ -1021,6 +1021,7 @@ export default {
       console.log(val, '上锁人chage')
       if (val) {
         // 操作选中角色发生变化
+        this.newticketUserDTOList=[]
         this.$set(this.dialogForm, this.dialogForm.locker, val)
       } else {
         this.$set(this.dialogForm, this.dialogForm.locker, '')
@@ -1051,6 +1052,12 @@ export default {
       console.log(this.newticketUserDTOList, '清除后的用户');
     },
     InSelectionChange(selection) {
+      // 移除未选中的用户
+      this.AllUserTable = this.AllUserTable.filter((user) =>
+        selection.some((item) => item.userId === user.userId)
+      );
+
+      // 添加新的内部用户
       selection.forEach((item) => {
         if (!this.AllUserTable.some((user) => user.userId === item.userId)) {
           this.AllUserTable.push({
@@ -1058,13 +1065,20 @@ export default {
             userId: item.userId,
             userType: 0,
             userRole: 'jtcolocker'
-          })
+          });
         }
-      })
-      console.log(this.AllUserTable, '内部人员')
+      });
+
+      console.log(this.AllUserTable, '内部人员');
     },
 
     OutSelectionChange(selection) {
+      // 移除未选中的用户
+      this.AllUserTable = this.AllUserTable.filter((user) =>
+        selection.some((item) => item.userId === user.userId)
+      );
+
+      // 添加新的外部用户
       selection.forEach((item) => {
         if (!this.AllUserTable.some((user) => user.userId === item.userId)) {
           this.AllUserTable.push({
@@ -1072,10 +1086,11 @@ export default {
             userId: item.userId,
             userType: 1,
             userRole: 'jtcolocker'
-          })
+          });
         }
-      })
-      console.log(this.AllUserTable, '外部人员')
+      });
+
+      console.log(this.AllUserTable, '外部人员');
     },
     confirmAddUser() {
       const data = {

src/views/mes/md/workarea/MapData.vue

@@ -290,7 +290,7 @@ export default {
           const text = new Konva.Text({
             x: x + 8,
             y: y + 50,
-            fontSize: 20,
+            fontSize: 18,
             text: labelText,
             fontFamily: 'Calibri',
             fill: 'red'

src/views/system/technology/technologyDetail/MapData.vue

@@ -330,7 +330,7 @@ export default {
           const text = new Konva.Text({
             x: x + 8,
             y: y + 50,
-            fontSize: 20,
+            fontSize: 18,
             text: labelText,
             fontFamily: 'Calibri',
             fill: 'red'

src/views/system/technology/technologyList/MapData.vue

@@ -320,7 +320,7 @@ export default {
           const text = new Konva.Text({
             x: x + 8,
             y: y + 50,
-            fontSize: 20,
+            fontSize: 18,
             text: labelText,
             fontFamily: 'Calibri',
             fill: 'red'