| src/components/assemble/index.vue | ●●●●● patch | view | raw | blame | history | |
| src/styles/base/index.scss | ●●●●● patch | view | raw | blame | history | |
| src/styles/media/index.scss | ●●●●● patch | view | raw | blame | history | |
| src/views/activity/components/publicIndex.vue | ●●●●● patch | view | raw | blame | history |
src/components/assemble/index.vue
@@ -11,7 +11,7 @@ <template> <div> <el-dialog :title="dialogTile" :modal="true" :visible.sync="dialogVisible" :before-close="beforClose" :close-on-click-modal="true" class="equiment-details-box"> :close-on-click-modal="true" class="equiment-details-box-two"> <div class="header"> <div> 设备名称: @@ -31,7 +31,6 @@ <span>{{ (pages.current - 1) * pages.size + scope.$index + 1 }}</span> </template> </el-table-column> <el-table-column :show-overflow-tooltip="true" prop="name" label="设备名称" min-width="320%"></el-table-column> <el-table-column :show-overflow-tooltip="true" prop="channelId" label="通道编号" @@ -42,7 +41,7 @@ <template slot-scope="scope"> <i class="status-box" :class="{ online: Number(scope.row.status) === 1 }"></i> </template> </el-table-column>z </el-table-column> <el-table-column label="操作"> <template slot-scope="scope"> <el-button @click="play(scope.row)" type="text" size="small" title="播放视频"> @@ -163,14 +162,22 @@ searchEquiment () { this.equimentLoading = true this.pages.current = 1 this.searchData = this.tableData.filter(item => item.name.indexOf(this.equimentSearchVal.trim()) != -1) setTimeout(() => { this.equimentLoading = false this.searchData = this.tableData.filter(item => item.name.indexOf(this.equimentSearchVal.trim()) != -1) }, 1000) }, clearSearchEquiment () { this.equimentLoading = true this.equimentSearchVal = '' this.searchData = this.tableData setTimeout(() => { this.equimentLoading = false this.searchData = this.tableData }, 1000) } }, src/styles/base/index.scss
@@ -224,7 +224,8 @@ .area-details-box, .keyPerson-details-box, .land-details-box, .equiment-details-box { .equiment-details-box, .equiment-details-box-two { .el-dialog { display: flex; flex-direction: column; @@ -321,6 +322,22 @@ } } .equiment-details-box-two { .el-dialog { height: 786px; } .all-pagination-sty { margin-top: 10px; } .el-main { padding: 0; width: 100%; height: calc(100% - 40px); } } .keyPerson-details-box-two { .el-dialog { display: flex; src/styles/media/index.scss
@@ -2033,7 +2033,8 @@ .area-details-box, .keyPerson-details-box, .land-details-box, .equiment-details-box { .equiment-details-box, .equiment-details-box-two { .el-dialog { width: countSizeVw(1000, 1920); height: countSizeVh(640); @@ -2046,6 +2047,24 @@ .el-dialog .el-dialog__body .el-table { height: calc(100% - countSizeVh(60)) !important; } } .equiment-details-box-two { .el-dialog { height: countSizeVh(1000); } .all-pagination-sty { margin-top: countSizeVh(10); } .el-main { height: calc(100% - countSizeVh(50)) !important; } .el-dialog .el-dialog__body .el-table { height: calc(100% - countSizeVh(40)) !important; } } @@ -2703,7 +2722,6 @@ .dc-location-bar.homebottom { bottom: countSizeVh(390) !important; } .image-switch-img-btn { top: 0; src/views/activity/components/publicIndex.vue
@@ -8,7 +8,7 @@ <polyline-plot ref="PolylinePlotPage" :showingSecurityId="showingSecurityId"></polyline-plot> <two-draw-btn-box v-if="currentPlotType == 1" ref="DRAWBTNBOX" :dialogVisible="dialogVisible" <two-draw-btn-box v-if="currentPlotType == 1" ref="DRAWBTNBOX" :="dialogVisible" :isShowActivityEditBox="isShowActivityEditBox" :showingSecurityId="showingSecurityId" :policeSwitch="policeSwitch" :polylineBtnSwitch="polylineBtnSwitch" :arrowBtnSwitch="arrowBtnSwitch" :policeIconId="policeIconId" :lineWidth="lineWidth" @setPoliceOption="setPoliceOption"></two-draw-btn-box>