瀏覽代碼

1. 修复bug

MONSTER-ygh 1 年之前
父節點
當前提交
5aec7c0e66

+ 4 - 3
src/views/venue/performanceHallMr/mixins/selectList.js

@@ -161,14 +161,15 @@ export default {
                 this.tableDataAll = JSON.parse(JSON.stringify(listTabel))
             }else{
                 let listTabel = JSON.parse(JSON.stringify(this.tableDataAll))
-                let listSelect = JSON.parse(JSON.stringify(this.multipleSelection))
+                let listSelect = JSON.parse(JSON.stringify(this.selectTabelList))
                 if(this.formAll.seatPriorityPosition == 2) {
                     listSelect.reverse()
                 }
+                console.log("fsafsdfa=====",listSelect)
                 let num = Number(this.formAll.setaPriorityNum)
-                for(let i=0;i<this.selectTabelList.length;i++){
+                for(let i=0;i<listSelect.length;i++){
                     for(let j=0;j<this.tableDataAll.length;j++){
-                        if(this.selectTabelList[i].styleCss.id == this.tableDataAll[j].styleCss.id){
+                        if(listSelect[i].styleCss.id == this.tableDataAll[j].styleCss.id){
                             listTabel[j] = {
                                 ...this.tableDataAll[j],
                                 priority: num

+ 25 - 8
src/views/venue/performanceHallMr/model/seatManagementTable.vue

@@ -12,11 +12,11 @@
                 :key="item.id" 
                 v-for="(item,index) in seatTypeList"
                 >
-                    <span :style="{backgroundColor: item.color}"></span>
+                    <span :style="{backgroundColor: item.color,border: '1px solid #000'}"></span>
                     <span :style="{color: item.color}">{{ item.name }}</span>    
                 </div>
                 <div>
-                    <span :style="{backgroundColor: '#ccc'}"></span>
+                    <span :style="{backgroundColor: '#ccc',border: '1px solid #000'}"></span>
                     <span :style="{color: '#ccc'}">{{ "不可用" }}</span>    
                 </div>
                 <div>
@@ -86,14 +86,13 @@
                         <template slot-scope="scope">
                             <div class="row-item-box" :style='{display: "flex",flexWrap: "nowrap",justifyContent: item.align}'>
                                 <div 
-                                :class="['row-item']"
+                                :class="['row-item',selectList.includes(item1.styleCss.id) ? 'row-item-select': '']"
                                 v-for="(item1,index1) in scope.row[item.key]" 
                                 :key="item1.styleCss.id"
                                 dragSelectType="div"
                                 :dragSelectId="item1.styleCss.id"
                                 :style="{
                                     backgroundColor: item1.status == 1 ? item1.color?item1.color: '#fff': '#ccc',
-                                    border: selectList.includes(item1.styleCss.id) ? '5px solid #1890ff': '1px solid #000'
                                 }"
                                 @contextmenu="(e)=>{e.preventDefault();openFormDialogVisible('singleEdit',item1)}"
                                 >
@@ -462,8 +461,8 @@ export default {
             tableDataAll: [], // 全部的座位
             widthAll: '100%',
             heightAll: '100%',
-            width: 60,
-            height: 60,
+            width: 65,
+            height: 65,
             spacing: 10,
             whNum: 43,
 
@@ -1480,7 +1479,8 @@ export default {
         width: var(--row-w);
         height: var(--row-h);
         margin-left: 5px;
-        border: 1px solid #ccc;
+        border: 1px solid rgba(0,0,0,0.5);
+        border-radius: 2px;
         display: flex;
         flex-direction: column;
         flex-shrink: 0;
@@ -1495,6 +1495,7 @@ export default {
             transform: scale(var(--row-scale));
             display: flex;
             flex-direction: column;
+            padding: 5px;
         }
         i {
             color: #000;
@@ -1520,7 +1521,23 @@ export default {
         background-position: 50% 50%;
         background-repeat: no-repeat;
         z-index: 1;
-    }    
+    }   
+    .row-item-select {
+        border: 5px solid #1890ff;
+    }
+    // .row-item-select::after {
+    //     content:"";
+    //     display:block;
+    //     position:absolute;
+    //     top:0;
+    //     left:0;
+    //     width: 100%;
+    //     height: 100%;
+    //     border: 5px solid #1890ff;
+    //     z-index: 1;
+    //     padding: 5px;
+    // }    
+ 
     .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
         border-bottom: none !important;
     }