@@ -174,13 +142,11 @@ import crudRegion from '@/api/area/index'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import { mapGetters } from 'vuex'
-import { swiper, swiperSlide } from 'vue-awesome-swiper'
-import 'swiper/dist/css/swiper.css'
const defaultForm = { id: null, taskType: null, taskName: null, location: null, number: null, remark: null }
export default {
name: 'DataScreening',
- components: { swiper, swiperSlide, crudOperation },
+ components: { crudOperation },
cruds() {
return CRUD({ title: '架位总览', url: 'api/libraryRegion/initLibraryRegionList', crudMethod: { ...crudRegion }, sort: [], optShow: {
add: false,
@@ -197,8 +163,11 @@ export default {
data() {
const _this = this
return {
+ listLoading: false,
+ tabIndex: 0,
floorName: null,
regionName: null,
+ rowType: null,
bookShelfDetails: null,
booShelfGrid: null,
cellInfo: {
@@ -249,7 +218,7 @@ export default {
{ required: true, message: '请输入目标数量', trigger: 'blur' }
]
},
- popoverIndex: 1,
+ popoverIndex: null,
popoverVisible: [],
popoverStyles: []
}
@@ -268,9 +237,9 @@ export default {
cellStyle: function() {
// const h = '100%/' + this.layerNum
// const w = '100%/' + this.rackNum
- const h = '60px'
+ const h = '76px'
const w = '100%/' + this.rackNum
- return { width: `calc(${w} - 4px )`, height: `calc(${h} - 2px)` }
+ return { width: `calc(${w} )`, height: `calc(${h})` }
}
},
async created() {
@@ -278,6 +247,7 @@ export default {
const dataScreenRegion = JSON.parse(localStorage.getItem('dataScreenRegion'))
this.floorName = dataScreenRegion.floorName
this.regionName = dataScreenRegion.regionName
+ this.rowType = dataScreenRegion.rowType
// 单面/双面
this.tabListData = dataScreenRegion.rowType === 1
? dataScreenRegion.toward === 1
@@ -286,6 +256,7 @@ export default {
: [{ name: 'A面' }, { name: 'B面' }]
FetchBookShelfDetails({ 'shelfId': dataScreenRegion.id }).then(res => {
+ this
this.layerNum = res.shelfFloor
this.rackNum = res.shelfShelf
this.bookShelfDetails = res
@@ -295,9 +266,6 @@ export default {
}
},
methods: {
- handleToGrids() {
- this.$router.push({ path: '/dataScreening/gird', query: { }})
- },
[CRUD.HOOK.beforeRefresh]() {
},
[CRUD.HOOK.afterRefresh](crud) {
@@ -314,6 +282,7 @@ export default {
return gridNames
},
getInitShelfGridByShelfId(toward) {
+ this.listLoading = true
// rowType 1 单 2 双
// toward 1 A面 2 B面
// shelfType 1 '始终最左边为第1架（S型排架）'
@@ -337,7 +306,9 @@ export default {
this.booShelfGrid = this[sortMethod](res)
this.popoverVisible = Array(this.booShelfGrid.length).fill(false)
- // this.popoverStyles = new Array(this.booShelfGrid.length).fill({ position: 'absolute', left: '20%', top: '48px' })
+ setTimeout(() => {
+ this.listLoading = false
+ }, 1000)
}).catch(() => {
})
},
@@ -415,34 +386,34 @@ export default {
}
return sortedData
},
- handleSlidClickFun(index) {
+ changeActiveTab(index) {
+ this.tabIndex = index
this.cellIndex = null
- this.handleSlideToFun(index)
- if (localStorage.getItem('bookShelfDetails')) {
- this.getInitShelfGridByShelfId(index + 1)
- }
- },
- handleSlideToFun(index) {
- this.swiperActiveIndex = index
- this.swiperContent.slideTo(index, 500, false)
- this.swiperTitle.slideTo(index, 500, false)
+ this.getInitShelfGridByShelfId(index + 1)
},
handleCellCurrent(item, index) {
console.log('index', index)
+ console.log('item', item)
this.cellIndex = index
this.cellInfo = {
id: item.id,
gridName: item.gridName,
- startSortmark: item.startSortmark,
- endSortmark: item.endSortmark,
- cameraId: item.cameraId,
- check: item.isCheck,
- order: item.isOrder
+ gridRow: item.gridRow,
+ gridShelf: item.gridShelf,
+ shelfId: item.shelfId,
+ floorName: this.floorName,
+ regionName: this.regionName,
+ rowType: this.rowType,
+ toward: item.toward
}
+ this.handleToGrids(this.cellInfo)
+ },
+ handleToGrids(data) {
+ this.$router.push({ path: '/dataScreening/gird' })
+ localStorage.setItem('dataScreenShelf', JSON.stringify(data))
},
showPopover(index) {
this.popoverIndex = index
- // 显示对应的 popover
if (!this.popoverVisible[index]) {
this.$set(this.popoverVisible, index, true)
}
@@ -451,19 +422,18 @@ export default {
const secondLastColumnIndexes = []
for (let i = 0; i < this.booShelfGrid.length; i++) {
- // 计算当前数据项的列索引
const columnIndex = i % this.rackNum
// 如果是最后一列（第5列）
if (columnIndex === this.rackNum - 1) {
lastColumnIndexes.push(i)
// 更新最后一列的样式
- this.$set(this.popoverStyles, i, { position: 'absolute', left: '-140px', top: '48px' })
+ // this.$set(this.popoverStyles, i, { position: 'absolute', left: '0', top: '20px' })
}
// 如果是倒数第二列（第4列）
if (columnIndex === this.rackNum - 2) {
secondLastColumnIndexes.push(i)
// 更新倒数第二列的样式
- this.$set(this.popoverStyles, i, { position: 'absolute', left: '-20px', top: '48px' })
+ // this.$set(this.popoverStyles, i, { position: 'absolute', left: '-20px', top: '20px' })
}
}
},
@@ -487,16 +457,7 @@ export default {
.venue-content{
position: relative;
}
-.venue-header{
- h4{
- flex: 1;
- }
- .bookshelf-area{
- padding-right: 30px;
- font-weight: bold;
- color: #0348F3;
- }
-}
+
.crud-opts{
position: absolute;
right: 20px;
@@ -566,62 +527,95 @@ export default {
}
}
}
-.swiper-title{
- ::v-deep .swiper-wrapper{
- margin: 10px 0;
- border-bottom: 1px solid #EDEFF3;
- }
-}
-.swiper-slide-title {
- width: auto !important;
- margin-right: 20px;
- cursor: pointer;
- .tab-name {
- padding: 10px;
- &.active {
- color: #0348F3;
- border-bottom: 3px solid #0348F3;
- }
- }
-}
-
-.swiper-content{
- height: 600px;
-}
.tag-info{
position: absolute;
right: 20px;
- top: 34px;
- display: flex;
- justify-content: flex-start;
- padding-left: 100px;
+ top: 8px;
p{
margin-left: 20px;
- margin-top: -4px;
+ }
+}
+
+.shelf-top{
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ text-align: center;
+ margin-top: 20px;
+ p{
font-size: 14px;
+ color: #fff;
+ height: 36px;
+ line-height: 30px;
+ background: url('~@/assets/images/shelf04.png') no-repeat center top;
+ background-size: auto 100%;
}
}
-.cabinet-row .cabinet-cell{
- overflow: inherit;
- cursor: pointer;
- span.cell-name{
- position: initial !important;
- transform: none;
- line-height: 58px;
+
+.data-shelf-row{
+ display: flex;
+ flex: 1;
+ flex-wrap: wrap;
+ text-align: center;
+ // margin-top: -2px;
+ // padding-top: 40px;
+ .data-shelf-cell{
+ position: relative;
+ font-size: 14px;
+ color: #0C0E1E;
+ background: url('~@/assets/images/shelf02.png') repeat-x left top;
+ background-size: 20% 100%;
+ border-radius: 3px;
+ cursor: pointer;
+ .tag-info{
+ right: 12px;
+ top: 44px;
+ p{
+ margin-left: 10px;
+ }
+ }
+ &::before{
+ content: "";
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 6px;
+ height: 76px;
+ background: url('~@/assets/images/shelf01.png') no-repeat left top;
+ background-size: 100% 100%;
+ }
+ &::after{
+ content: "";
+ position: absolute;
+ right: -4px;
+ top: 0;
+ width: 6px;
+ height: 76px;
+ background: url('~@/assets/images/shelf01.png') no-repeat left top;
+ background-size: 100% 100%;
+ }
+ .cell-name{
+ display: block;
+ width: 100%;
+ line-height: 76px;
+ }
+ &.active{
+ color: #fff;
+ background-color: #0348F3;
+ }
}
}
-::v-deep .cabinet-row .cabinet-cell span.el-popover__reference-wrapper{
+
+::v-deep .data-shelf-row span.el-popover__reference-wrapper{
position: absolute !important;
- left: 50% !important;
- top: 20px !important;
- transform: none;
+ left: 60% !important;
+ top: 48px !important;
width: 300px;
height: 210px;
background:rgba(0,0,0,.8);
color: #fff;
border-radius: 6px;
z-index: 99999999;
-
.popover-content{
.tooltip-top{
display: flex;
diff --git a/src/views/visualCheck/checkManage/upDownLog/index.vue b/src/views/visualCheck/checkManage/upDownLog/index.vue
index 3ab5917..50e405d 100644
--- a/src/views/visualCheck/checkManage/upDownLog/index.vue
+++ b/src/views/visualCheck/checkManage/upDownLog/index.vue
@@ -1,16 +1,159 @@
-
- 上架/下架日志
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime | parseTime }}
+
+
+
+
+
+
+
+
-
diff --git a/src/views/visualCheck/venueDevice/bookshelfPosition/index.vue b/src/views/visualCheck/venueDevice/bookshelfPosition/index.vue
index 7390eca..3057adb 100644
--- a/src/views/visualCheck/venueDevice/bookshelfPosition/index.vue
+++ b/src/views/visualCheck/venueDevice/bookshelfPosition/index.vue
@@ -552,16 +552,6 @@ export default {