xymp
/
frontend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

间距调整

Browse Source
hn2.0
fanluyan 2 years ago
parent 9bc61fae8f
commit 876ca6e533
12 changed files with 140 additions and 129 deletions
Show Stats Download Patch File Download Diff File

12
src/views/alarmHandling/index.vue
Unescape Escape View File

@ -519,9 +519,9 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.alarmHandBox { .alarmHandBox {
width: calc(100% - 32px); width: calc(100% - 24px);
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px 16px; padding: 12px 12px;
background: #ffffff; background: #ffffff;
.showPic { .showPic {
position: fixed; position: fixed;
@ -572,9 +572,9 @@ export default {
} }
.searchMain { .searchMain {
border: 1px solid #dddddd; border: 1px solid #dddddd;
height: calc(100% - 34px); height: calc(100% - 22px);
max-height: calc(100% - 34px); max-height: calc(100% - 22px);
padding: 16px; padding: 12px;
border-radius: 4px; border-radius: 4px;
.searchBox { .searchBox {
.ml10 { .ml10 {

10
src/views/cameraChannel/index.vue
Unescape Escape View File

@ -187,15 +187,15 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.camerChannel { .camerChannel {
width: calc(100% - 32px); width: calc(100% - 24px);
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px 16px; padding: 12px 12px;
background: @color-white; background: @color-white;
.deviceBox { .deviceBox {
border: 1px solid #dddddd; border: 1px solid #dddddd;
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px; padding: 12px;
border-radius: 4px; border-radius: 4px;
} }
.deviceBtnGroup { .deviceBtnGroup {

10
src/views/devicePhotoSchedule/index.vue
Unescape Escape View File

@ -224,15 +224,15 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.deviceInformation { .deviceInformation {
width: calc(100% - 32px); width: calc(100% - 24px);
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px 16px; padding: 12px 12px;
background: @color-white; background: @color-white;
.deviceBox { .deviceBox {
border: 1px solid #dddddd; border: 1px solid #dddddd;
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px; padding: 12px;
border-radius: 4px; border-radius: 4px;
} }
.deviceBtnGroup { .deviceBtnGroup {

10
src/views/deviceUpgrade/index.vue
Unescape Escape View File

@ -109,14 +109,14 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.deviceUpgrade { .deviceUpgrade {
width: calc(100% - 32px); width: calc(100% - 24px);
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px 16px; padding: 12px 12px;
background: #ffffff; background: #ffffff;
.upgradeBox { .upgradeBox {
border: 1px solid #dddddd; border: 1px solid #dddddd;
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px; padding: 12px;
border-radius: 4px; border-radius: 4px;
.upBtnGroup { .upBtnGroup {
display: flex; display: flex;

2
src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
Unescape Escape View File

@ -30,7 +30,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="杆塔名称：" prop="towerId"> <el-form-item label="杆塔名称：" prop="towerId">
<el-select v-model="formInfo.towerId" placeholder="请选择"> <el-select v-model="formInfo.towerId" placeholder="请选择" filterable>
<el-option <el-option
v-for="item in toweridOptions" v-for="item in toweridOptions"
:key="item.id" :key="item.id"

10
src/views/management/monitoringEquipment/photographicDevice/index.vue
Unescape Escape View File

@ -683,14 +683,14 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.photoGraphicDevice { .photoGraphicDevice {
width: calc(100% - 32px); width: calc(100% - 24px);
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px 16px; padding: 12px 12px;
background: @color-white; background: @color-white;
.photoBox { .photoBox {
border: 1px solid #dddddd; border: 1px solid #dddddd;
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px; padding: 12px;
border-radius: 4px; border-radius: 4px;
.searchBox { .searchBox {
.ml10 { .ml10 {

10
src/views/management/userEquipment/lineInformation/index.vue
Unescape Escape View File

@ -204,14 +204,14 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.lineInformation { .lineInformation {
width: calc(100% - 32px); width: calc(100% - 24px);
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px 16px; padding: 12px 12px;
background: @color-white; background: @color-white;
.lineBox { .lineBox {
border: 1px solid #dddddd; border: 1px solid #dddddd;
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px; padding: 12px;
border-radius: 4px; border-radius: 4px;
} }
.lineBtnGroup { .lineBtnGroup {

10
src/views/management/userEquipment/towerInformation/index.vue
Unescape Escape View File

@ -191,15 +191,15 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.deviceInformation { .deviceInformation {
width: calc(100% - 32px); width: calc(100% - 24px);
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px 16px; padding: 12px 12px;
background: @color-white; background: @color-white;
.deviceBox { .deviceBox {
border: 1px solid #dddddd; border: 1px solid #dddddd;
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px; padding: 12px;
border-radius: 4px; border-radius: 4px;
} }
.deviceBtnGroup { .deviceBtnGroup {

165
src/views/pictureRotation/index.vue
Unescape Escape View File

@ -1,82 +1,86 @@
<template> <template>
<div class="picRotation"> <div class="picRotation">
<div class="picHead"> <div class="rotationBox">
<div class="pageNation"> <div class="picHead">
<el-pagination <div class="pageNation">
@current-change="handleCurrentChange" <el-pagination
:current-page="page" @current-change="handleCurrentChange"
:page-size="pageSize" :current-page="page"
layout=" prev, pager, next, jumper,total" :page-size="pageSize"
:total="total" layout=" prev, pager, next, jumper,total"
> :total="total"
</el-pagination> >
</div> </el-pagination>
<div class="buttonGroup"> </div>
<span class="info"> <div class="buttonGroup">
<b> {{ isRuning ? remainingTime : "已暂停" }} </b> <span class="info">
</span> <b> {{ isRuning ? remainingTime : "已暂停" }} </b>
<el-button type="primary" @click="toggleCountdown">{{ </span>
isRuning ? "暂停轮巡" : "开始轮巡" <el-button type="primary" @click="toggleCountdown">{{
}}</el-button> isRuning ? "暂停轮巡" : "开始轮巡"
<el-button type="primary" @click="setbtn">设置</el-button> }}</el-button>
<el-button type="primary" @click="setbtn">设置</el-button>
</div>
</div> </div>
</div> <div class="imageCenter" v-loading="loading" v-cloak>
<div class="imageCenter" v-loading="loading" v-cloak> <el-row
<el-row v-for="i in rowNum"
v-for="i in rowNum" :key="'row-' + i"
:key="'row-' + i" :style="{ height: 100 / rowNum + '%' }"
:style="{ height: 100 / rowNum + '%' }"
>
<el-col
:span="24 / colNum"
v-for="(item, index) in picList"
v-if="index < colNum * i && index >= colNum * (i - 1)"
:key="'col-' + index"
> >
<div class="imgList"> <el-col
<viewer :span="24 / colNum"
:options="OptionssalseImg" v-for="(item, index) in picList"
v-if="item.path !== null && item.path.indexOf('videos') == -1" v-if="index < colNum * i && index >= colNum * (i - 1)"
class="bigpic" :key="'col-' + index"
:style=" >
item.path ? 'backgroundImage:url(' + item.path + '!128x72)' : '' <div class="imgList">
" <viewer
> :options="OptionssalseImg"
<img :src="item.path + '!1280x720'" /> v-if="item.path !== null && item.path.indexOf('videos') == -1"
</viewer> class="bigpic"
<div :style="
class="bigpic" item.path
v-else-if=" ? 'backgroundImage:url(' + item.path + '!128x72)'
item.path !== null && item.path.indexOf('videos') !== -1 : ''
" "
> >
<video <img :src="item.path + '!1280x720'" />
width="100%" </viewer>
height="100%" <div
:src="item.path" class="bigpic"
controls="controls" v-else-if="
></video> item.path !== null && item.path.indexOf('videos') !== -1
</div> "
<div class="bigpic" v-else> >
<img src="../../assets/img/nopic.jpg" /> <video
width="100%"
height="100%"
:src="item.path"
controls="controls"
></video>
</div>
<div class="bigpic" v-else>
<img src="../../assets/img/nopic.jpg" />
</div>
<p class="infoTop">
{{ item.linename }}-{{
item.displayname !== null && item.displayname !== ""
? item.displayname
: item.cmdid
}}-{{
item.alias !== null && item.alias !== ""
? item.alias
: item.channnelname
}}
</p>
<p class="infoBottom" v-if="item.photoTime !== null">
{{ $moment(item.photoTime).format("yy-MM-DD HH:mm:ss") }} 
</p>
</div> </div>
<p class="infoTop"> </el-col>
{{ item.linename }}-{{ </el-row>
item.displayname !== null && item.displayname !== "" </div>
? item.displayname
: item.cmdid
}}-{{
item.alias !== null && item.alias !== ""
? item.alias
: item.channnelname
}}
</p>
<p class="infoBottom" v-if="item.photoTime !== null">
{{ $moment(item.photoTime).format("yy-MM-DD HH:mm:ss") }} 
</p>
</div>
</el-col>
</el-row>
</div> </div>
<el-dialog <el-dialog
title="设置" title="设置"
@ -339,10 +343,17 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.picRotation { .picRotation {
width: calc(100% - 32px); width: calc(100% - 24px);
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px 16px; padding: 12px 12px;
background: #ffffff; background: #ffffff;
.rotationBox {
border: 1px solid #dddddd;
height: calc(100% - 22px);
max-height: calc(100% - 22px);
padding: 12px;
border-radius: 4px;
}
.picHead { .picHead {
display: flex; display: flex;
align-items: center; align-items: center;

10
src/views/realTimeSearch/index.vue
Unescape Escape View File

@ -351,14 +351,14 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.realTimeSearch { .realTimeSearch {
width: calc(100% - 32px); width: calc(100% - 24px);
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px 16px; padding: 12px 12px;
background: #fff; background: #fff;
.searchMain { .searchMain {
border: 1px solid #dddddd; border: 1px solid #dddddd;
height: calc(100% - 32px); height: calc(100% - 22px);
padding: 16px; padding: 12px;
border-radius: 4px; border-radius: 4px;
.ml10 { .ml10 {
margin-left: 10px; margin-left: 10px;

10
src/views/system/globalTools/index.vue
Unescape Escape View File

@ -118,14 +118,14 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.globalBox { .globalBox {
width: calc(100% - 32px); width: calc(100% - 24px);
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px 16px; padding: 12px 12px;
background: #fff; background: #fff;
.setBox { .setBox {
border: 1px solid #dddddd; border: 1px solid #dddddd;
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px; padding: 12px;
border-radius: 4px; border-radius: 4px;
display: flex; display: flex;
.globalDrawLine { .globalDrawLine {

10
src/views/system/userManagement.vue
Unescape Escape View File

@ -171,15 +171,15 @@ export default {
</script> </script>
<style lang="less"> <style lang="less">
.camerChannel { .camerChannel {
width: calc(100% - 32px); width: calc(100% - 24px);
height: calc(100% - 32px); height: calc(100% - 24px);
padding: 16px 16px; padding: 12px 12px;
background: @color-white; background: @color-white;
.deviceBox { .deviceBox {
border: 1px solid #dddddd; border: 1px solid #dddddd;
height: calc(100% - 32px); height: calc(100% - 24x);
padding: 16px; padding: 12px;
border-radius: 4px; border-radius: 4px;
} }
.deviceBtnGroup { .deviceBtnGroup {

Write Preview
Loading…
Cancel
Save