大屏样式排版问题 包括弹窗、翻页等等

大屏样式影响到页面的样式
20245024-wz
qiuyt 5 months ago
parent 1323effc5d
commit efe4398584

@ -5,7 +5,7 @@
"author": "LionLi",
"license": "MIT",
"scripts": {
"dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --open",
"dev": " vue-cli-service serve --open",
"build:prod": "vue-cli-service build",
"build:test": "vue-cli-service build --mode test",
"preview": "node build/index.js --preview",
@ -44,7 +44,7 @@
"axios": "0.24.0",
"clipboard": "2.0.8",
"core-js": "3.19.1",
"echarts": "4.9.0",
"echarts": "^5.5.1",
"element-china-area-data": "^5.0.2",
"element-ui": "2.15.8",
"file-saver": "2.0.5",

@ -1,10 +1,10 @@
/* 弹窗 */
.el-dialog {
background-color: rgba(255, 255, 255, 0);
margin: 0 auto 50px;
/*width: 80%;*/
/*text-align: center;*/
}
/*!* 弹窗 *!*/
/*.el-dialog {*/
/* background-color: rgba(255, 255, 255, 0);*/
/* margin: 0 auto 50px;*/
/* !*width: 80%;*!*/
/* !*text-align: center;*!*/
/*}*/
.el-pager li {
/*background-color: #111217;*/
@ -12,31 +12,31 @@
/*background-image: url(../../assets/img/data08.png);*/
}
.el-dialog__title {
color: rgb(255, 255, 255);
font-weight: 900;
background-color: #134b8e;
}
/*.el-dialog__title {*/
/* color: rgb(255, 255, 255);*/
/* font-weight: 900;*/
/* background-color: #134b8e;*/
/*}*/
.el-dialog__header {
/*padding-top: 10px !important;*/
background-color: #134b8e;
/*background-color: #FF000000;*/
border-radius: 14px 14px 0 0;
color: #fff;
}
/*.el-dialog__header {*/
/* !*padding-top: 10px !important;*!*/
/* background-color: #134b8e;*/
/* !*background-color: #FF000000;*!*/
/* !*border-radius: 14px 14px 0 0;*!*/
/* color: #fff;*/
/*}*/
.el-dialog__body {
border-top: 0 !important;
background-color: #134b8e;
/*color: #FFFFFF;*/
}
/*.el-dialog__body {*/
/* border-top: 0 !important;*/
/* background-color: #134b8e;*/
/* !*color: #FFFFFF;*!*/
/*}*/
.el-dialog__footer {
text-align: center;
/*background-color: rgba(255, 255, 255, 0);*/
background-color: #134b8e;
}
/*.el-dialog__footer {*/
/* text-align: center;*/
/* !*background-color: rgba(255, 255, 255, 0);*!*/
/* background-color: #134b8e;*/
/*}*/
.el-descriptions-item__label.is-bordered-label {
@ -50,3 +50,4 @@
/*background-color: #fff*/
background-color: rgba(255, 255, 255, 0);
}

@ -0,0 +1,116 @@
<template>
<div :class="{'hidden':hidden}" class="pagination-container">
<el-pagination
:background="background"
:current-page.sync="currentPage"
:page-size.sync="pageSize"
:layout="layout"
:page-sizes="pageSizes"
:pager-count="pagerCount"
:total="total"
v-bind="$attrs"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
</div>
</template>
<script>
import {scrollTo} from '@/utils/scroll-to'
export default {
name: 'PaginationDaping',
props: {
total: {
required: true,
type: Number
},
page: {
type: Number,
default: 1
},
limit: {
type: Number,
default: 20
},
pageSizes: {
type: Array,
default() {
return [10, 20, 30, 50]
}
},
// 5
pagerCount: {
type: Number,
default: document.body.clientWidth < 992 ? 5 : 7
},
layout: {
type: String,
default: 'total, sizes, prev, pager, next, jumper'
},
background: {
type: Boolean,
default: true
},
autoScroll: {
type: Boolean,
default: true
},
hidden: {
type: Boolean,
default: false
}
},
data() {
return {};
},
computed: {
currentPage: {
get() {
return this.page
},
set(val) {
this.$emit('update:page', val)
}
},
pageSize: {
get() {
return this.limit
},
set(val) {
this.$emit('update:limit', val)
}
}
},
methods: {
handleSizeChange(val) {
if (this.currentPage * val > this.total) {
this.currentPage = 1
}
this.$emit('pagination', {page: this.currentPage, limit: val})
if (this.autoScroll) {
scrollTo(0, 800)
}
},
handleCurrentChange(val) {
this.$emit('pagination', {page: val, limit: this.pageSize})
if (this.autoScroll) {
//
// scrollTo(0, 800)
}
}
}
}
</script>
<style scoped>
.pagination-container {
//background: #fff;
padding: 32px 16px;
}
.pagination-container.hidden {
display: none;
}
</style>

@ -22,6 +22,8 @@ import {getConfigKey, updateConfigByKey} from "@/api/system/config";
import {parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree} from "@/utils/ruoyi";
// 分页组件
import Pagination from "@/components/Pagination";
// 分页组件
import PaginationDaping from "@/components/Pagination/index-daping.vue";
// 自定义表格工具组件
import RightToolbar from "@/components/RightToolbar"
// 富文本组件
@ -63,6 +65,7 @@ Vue.prototype.handleTree = handleTree
// 全局组件挂载
Vue.component('DictTag', DictTag)
Vue.component('Pagination', Pagination)
Vue.component('PaginationDaping', PaginationDaping)
Vue.component('RightToolbar', RightToolbar)
Vue.component('Editor', Editor)
Vue.component('FileUpload', FileUpload)

@ -68,6 +68,7 @@ service.interceptors.request.use(
const s_data = sessionObj.data; // 请求数据
const s_time = sessionObj.time; // 请求时间
const interval = 1000; // 间隔时间(ms),小于此时间视为重复提交
if (
s_data === requestObj.data &&
requestObj.time - s_time < interval &&

@ -51,6 +51,7 @@
</div>
<el-dialog
class="el-dialog-daping"
title="产品品种"
:visible.sync="addDialogVisible"
:close-on-click-modal="false"
@ -74,6 +75,7 @@
<!-- </div>-->
</el-dialog>
<el-dialog
class="el-dialog-daping"
title="报备企业"
:visible.sync="addDialogVisible1"
:close-on-click-modal="false"
@ -87,6 +89,7 @@
></dialog1>
</el-dialog>
<el-dialog
class="el-dialog-daping"
title="预警信息"
:visible.sync="addDialogVisible2"
:close-on-click-modal="false"
@ -151,6 +154,7 @@ export default {
if (code == "350000")
this.curLoaction = "福建省"
currentGET("big8", {regionCode: code}).then((res) => {
console.log("设备分布", res);
console.log("设备分布code", res.data.code);
if (res.data.code == 20000) {
@ -174,11 +178,12 @@ export default {
if (this.isSouthChinaSea && name == "china") {
geoname = "chinaNanhai";
}
console.log('1111',echarts,name)
//
let mapjson = echarts.getMap(name);
if (mapjson) {
console.log('1111')
mapjson = mapjson.geoJSON;
} else {
@ -540,3 +545,41 @@ export default {
</style>
<style scoped>
.el-dialog-daping >>> .el-dialog__title {
color: rgb(255, 255, 255);
font-weight: 900;
background-color: #134b8e;
}
.el-dialog-daping >>> .el-dialog__header {
/*padding-top: 10px !important;*/
background-color: #134b8e;
/*background-color: #FF000000;*/
/*border-radius: 14px 14px 0 0;*/
color: #fff;
}
.el-dialog-daping >>> .el-dialog__body {
border-top: 0 !important;
background-color: #134b8e;
/*color: #FFFFFF;*/
}
.el-dialog-daping >>> .el-dialog__footer {
text-align: center;
/*background-color: rgba(255, 255, 255, 0);*/
background-color: #134b8e;
}
/* 弹窗 */
.el-dialog-daping {
background-color: rgba(255, 255, 255, 0);
margin: 0 auto 50px;
/*width: 80%;*/
/*text-align: center;*/
}
.el-dialog-daping >>> .pagination-container[data-v-72233bcd] {
//background: #fff;
padding: 32px 16px;
}
</style>

@ -74,13 +74,13 @@
</el-tabs>
<el-dialog
class="el-dialog-daping"
title="企业信息"
:visible.sync="addDialogVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="addDialogVisible"
append-to-body
class="dialog-two"
width="60%"
top="5vh"
>
@ -267,3 +267,41 @@ export default {
}
</style>
<style scoped>
.el-dialog-daping >>> .el-dialog__title {
color: rgb(255, 255, 255);
font-weight: 900;
background-color: #134b8e;
}
.el-dialog-daping >>> .el-dialog__header {
/*padding-top: 10px !important;*/
background-color: #134b8e;
/*background-color: #FF000000;*/
/*border-radius: 14px 14px 0 0;*/
color: #fff;
}
.el-dialog-daping >>> .el-dialog__body {
border-top: 0 !important;
background-color: #134b8e;
/*color: #FFFFFF;*/
}
.el-dialog-daping >>> .el-dialog__footer {
text-align: center;
/*background-color: rgba(255, 255, 255, 0);*/
background-color: #134b8e;
}
/* 弹窗 */
.el-dialog-daping {
background-color: rgba(255, 255, 255, 0);
margin: 0 auto 50px;
/*width: 80%;*/
/*text-align: center;*/
}
.el-dialog-daping >>> .pagination-container[data-v-72233bcd] {
//background: #fff;
padding: 32px 16px;
}
</style>

@ -39,6 +39,7 @@
<el-dialog
class="el-dialog-daping"
title="企业信息"
:visible.sync="addDialogVisible"
:close-on-click-modal="false"
@ -241,3 +242,41 @@ export default {
</style>
<style scoped>
.el-dialog-daping >>> .el-dialog__title {
color: rgb(255, 255, 255);
font-weight: 900;
background-color: #134b8e;
}
.el-dialog-daping >>> .el-dialog__header {
/*padding-top: 10px !important;*/
background-color: #134b8e;
/*background-color: #FF000000;*/
/*border-radius: 14px 14px 0 0;*/
color: #fff;
}
.el-dialog-daping >>> .el-dialog__body {
border-top: 0 !important;
background-color: #134b8e;
/*color: #FFFFFF;*/
}
.el-dialog-daping >>> .el-dialog__footer {
text-align: center;
/*background-color: rgba(255, 255, 255, 0);*/
background-color: #134b8e;
}
/* 弹窗 */
.el-dialog-daping {
background-color: rgba(255, 255, 255, 0);
margin: 0 auto 50px;
/*width: 80%;*/
/*text-align: center;*/
}
.el-dialog-daping >>> .pagination-container[data-v-72233bcd] {
//background: #fff;
padding: 32px 16px;
}
</style>

@ -45,13 +45,13 @@
<el-table-column label="产品描述" prop="cpms" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="运输条件" prop="" width="180" show-overflow-tooltip></el-table-column>
</el-table>
<pagination
<pagination-daping
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
></pagination-daping>
</div>
</template>
@ -128,7 +128,7 @@ export default {
::v-deep .el-table tr,
::v-deep .el-table td {
background-color: transparent !important;
color: #000000;
color: white;
}
::v-deep .el-table th {
background-color: #cfd3d7 !important;

@ -60,13 +60,13 @@
</el-table-column>
<!-- <el-table-column label="备注" prop="updateTime" width="150" show-overflow-tooltip></el-table-column>-->
</el-table>
<el-pagination
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
:current-page="filterQuery.page"
></el-pagination>
<pagination-daping
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination-daping>
</div>
</template>

@ -136,6 +136,7 @@
<el-dialog
class="el-dialog-daping"
title="上报品种明细"
:visible.sync="addDialogVisible"
:close-on-click-modal="false"
@ -694,3 +695,41 @@ export default {
}
}
</style>
<style scoped>
.el-dialog-daping >>> .el-dialog__title {
color: rgb(255, 255, 255);
font-weight: 900;
background-color: #134b8e;
}
.el-dialog-daping >>> .el-dialog__header {
/*padding-top: 10px !important;*/
background-color: #134b8e;
/*background-color: #FF000000;*/
/*border-radius: 14px 14px 0 0;*/
color: #fff;
}
.el-dialog-daping >>> .el-dialog__body {
border-top: 0 !important;
background-color: #134b8e;
/*color: #FFFFFF;*/
}
.el-dialog-daping >>> .el-dialog__footer {
text-align: center;
/*background-color: rgba(255, 255, 255, 0);*/
background-color: #134b8e;
}
/* 弹窗 */
.el-dialog-daping {
background-color: rgba(255, 255, 255, 0);
margin: 0 auto 50px;
/*width: 80%;*/
/*text-align: center;*/
}
.el-dialog-daping >>> .pagination-container[data-v-72233bcd] {
//background: #fff;
padding: 32px 16px;
}
</style>

@ -33,6 +33,7 @@
<el-dialog
class="el-dialog-daping"
title="企业信息"
:visible.sync="addDialogVisible"
:close-on-click-modal="false"
@ -154,7 +155,9 @@ export default {
}
;
</script>
<style lang='scss' scoped>
.list_Wrap {
height: 100%;
overflow: hidden;
@ -204,3 +207,41 @@ export default {
}
</style>
<style scoped>
.el-dialog-daping >>> .el-dialog__title {
color: rgb(255, 255, 255);
font-weight: 900;
background-color: #134b8e;
}
.el-dialog-daping >>> .el-dialog__header {
/*padding-top: 10px !important;*/
background-color: #134b8e;
/*background-color: #FF000000;*/
/*border-radius: 14px 14px 0 0;*/
color: #fff;
}
.el-dialog-daping >>> .el-dialog__body {
border-top: 0 !important;
background-color: #134b8e;
/*color: #FFFFFF;*/
}
.el-dialog-daping >>> .el-dialog__footer {
text-align: center;
/*background-color: rgba(255, 255, 255, 0);*/
background-color: #134b8e;
}
/* 弹窗 */
.el-dialog-daping {
background-color: rgba(255, 255, 255, 0);
margin: 0 auto 50px;
/*width: 80%;*/
/*text-align: center;*/
}
.el-dialog-daping >>> .pagination-container[data-v-72233bcd] {
//background: #fff;
padding: 32px 16px;
}
</style>

@ -43,13 +43,13 @@
<el-table-column label="产品描述" prop="cpms" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="运输条件" prop="" width="180" show-overflow-tooltip></el-table-column>
</el-table>
<pagination
<pagination-daping
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
></pagination-daping>
</div>
</template>
@ -132,6 +132,6 @@ res = typeof res.data === "undefined" ? res : res.data
::v-deep .el-table tr,
::v-deep .el-table td {
background-color: transparent !important;
color: #000000;
color: white;
}
</style>

@ -124,6 +124,7 @@
</div>
<el-dialog
class="el-dialog-daping"
title="现场检查查询"
:visible.sync="addDialogVisible"
:close-on-click-modal="false"
@ -586,3 +587,41 @@ export default {
}
}
</style>
<style scoped>
.el-dialog-daping >>> .el-dialog__title {
color: rgb(255, 255, 255);
font-weight: 900;
background-color: #134b8e;
}
.el-dialog-daping >>> .el-dialog__header {
/*padding-top: 10px !important;*/
background-color: #134b8e;
/*background-color: #FF000000;*/
/*border-radius: 14px 14px 0 0;*/
color: #fff;
}
.el-dialog-daping >>> .el-dialog__body {
border-top: 0 !important;
background-color: #134b8e;
/*color: #FFFFFF;*/
}
.el-dialog-daping >>> .el-dialog__footer {
text-align: center;
/*background-color: rgba(255, 255, 255, 0);*/
background-color: #134b8e;
}
/* 弹窗 */
.el-dialog-daping {
background-color: rgba(255, 255, 255, 0);
margin: 0 auto 50px;
/*width: 80%;*/
/*text-align: center;*/
}
.el-dialog-daping >>> .pagination-container[data-v-72233bcd] {
//background: #fff;
padding: 32px 16px;
}
</style>

@ -37,6 +37,7 @@
<el-dialog
class="el-dialog-daping"
title="企业信息"
:visible.sync="addDialogVisible"
:close-on-click-modal="false"
@ -198,3 +199,41 @@ export default {
}
</style>
<style scoped>
.el-dialog-daping >>> .el-dialog__title {
color: rgb(255, 255, 255);
font-weight: 900;
background-color: #134b8e;
}
.el-dialog-daping >>> .el-dialog__header {
/*padding-top: 10px !important;*/
background-color: #134b8e;
/*background-color: #FF000000;*/
/*border-radius: 14px 14px 0 0;*/
color: #fff;
}
.el-dialog-daping >>> .el-dialog__body {
border-top: 0 !important;
background-color: #134b8e;
/*color: #FFFFFF;*/
}
.el-dialog-daping >>> .el-dialog__footer {
text-align: center;
/*background-color: rgba(255, 255, 255, 0);*/
background-color: #134b8e;
}
/* 弹窗 */
.el-dialog-daping {
background-color: rgba(255, 255, 255, 0);
margin: 0 auto 50px;
/*width: 80%;*/
/*text-align: center;*/
}
.el-dialog-daping >>> .pagination-container[data-v-72233bcd] {
//background: #fff;
padding: 32px 16px;
}
</style>

@ -43,22 +43,13 @@
<el-table-column label="产品描述" prop="cpms" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="运输条件" prop="" width="180" show-overflow-tooltip></el-table-column>
</el-table>
<!-- <pagination-->
<!-- v-show="total>0"-->
<!-- :total="total"-->
<!-- :limit.sync="filterQuery.limit"-->
<!-- :page.sync="filterQuery.page"-->
<!-- @pagination="handleCurrentChange"-->
<!-- ></pagination>-->
<el-pagination
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
:current-page="filterQuery.page"
></el-pagination>
<pagination-daping
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination-daping>
</div>
</template>
@ -117,8 +108,7 @@ export default {
}
})
},
handleCurrentChange(val) {
this.filterQuery.page = val;
handleCurrentChange() {
this.getList();
},
@ -141,6 +131,6 @@ export default {
::v-deep .el-table tr,
::v-deep .el-table td {
background-color: transparent !important;
color: #000000;
color: white;
}
</style>

@ -20,13 +20,13 @@
</template>
</el-table-column>
</el-table>
<pagination
<pagination-daping
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
></pagination-daping>
<!-- <el-pagination-->
<!-- style="float: right;margin-top: 15px"-->
<!-- :page-size="20"-->
@ -119,6 +119,6 @@ export default {
::v-deep .el-table tr,
::v-deep .el-table td {
background-color: transparent !important;
color: #000000;
color: white;
}
</style>

@ -63,6 +63,7 @@
</div>
<el-dialog
class="el-dialog-daping"
title="查询不良事件"
:visible.sync="addDialogVisible"
:close-on-click-modal="false"
@ -83,27 +84,6 @@
<script type=" text
/javascript">
window._AMapSecurityConfig = {
securityJsCode: 'aa4657762e81008f99de042076c83384',
}
</script>
<script type="text/javascript"
src="https://webapi.amap.com/maps?v=1.4.15&key=5431bae8a043ee5d3ebdd7ddd4e58176"></script>
@ -389,3 +369,41 @@ export default {
height: 880px;
}
</style>
<style scoped>
.el-dialog-daping >>> .el-dialog__title {
color: rgb(255, 255, 255);
font-weight: 900;
background-color: #134b8e;
}
.el-dialog-daping >>> .el-dialog__header {
/*padding-top: 10px !important;*/
background-color: #134b8e;
/*background-color: #FF000000;*/
/*border-radius: 14px 14px 0 0;*/
color: #fff;
}
.el-dialog-daping >>> .el-dialog__body {
border-top: 0 !important;
background-color: #134b8e;
/*color: #FFFFFF;*/
}
.el-dialog-daping >>> .el-dialog__footer {
text-align: center;
/*background-color: rgba(255, 255, 255, 0);*/
background-color: #134b8e;
}
/* 弹窗 */
.el-dialog-daping {
background-color: rgba(255, 255, 255, 0);
margin: 0 auto 50px;
/*width: 80%;*/
/*text-align: center;*/
}
.el-dialog-daping >>> .pagination-container[data-v-72233bcd] {
//background: #fff;
padding: 32px 16px;
}
</style>

@ -38,7 +38,8 @@
></el-pagination>
<!-- <el-dialog-->
<!-- <el-dialog
class="el-dialog-daping"-->
<!-- title="企业信息"-->
<!-- :visible.sync="addDialogVisible"-->
<!-- :close-on-click-modal="false"-->
@ -53,6 +54,7 @@
<!-- </el-dialog>-->
<el-dialog
class="el-dialog-daping"
title="异常信息"
:visible.sync="addDialogVisible"
:close-on-click-modal="false"
@ -230,3 +232,41 @@ export default {
}
</style>
<style scoped>
.el-dialog-daping >>> .el-dialog__title {
color: rgb(255, 255, 255);
font-weight: 900;
background-color: #134b8e;
}
.el-dialog-daping >>> .el-dialog__header {
/*padding-top: 10px !important;*/
background-color: #134b8e;
/*background-color: #FF000000;*/
/*border-radius: 14px 14px 0 0;*/
color: #fff;
}
.el-dialog-daping >>> .el-dialog__body {
border-top: 0 !important;
background-color: #134b8e;
/*color: #FFFFFF;*/
}
.el-dialog-daping >>> .el-dialog__footer {
text-align: center;
/*background-color: rgba(255, 255, 255, 0);*/
background-color: #134b8e;
}
/* 弹窗 */
.el-dialog-daping {
background-color: rgba(255, 255, 255, 0);
margin: 0 auto 50px;
/*width: 80%;*/
/*text-align: center;*/
}
.el-dialog-daping >>> .pagination-container[data-v-72233bcd] {
//background: #fff;
padding: 32px 16px;
}
</style>

@ -43,13 +43,13 @@
<el-table-column label="产品描述" prop="cpms" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="运输条件" prop="" width="180" show-overflow-tooltip></el-table-column>
</el-table>
<pagination
<pagination-daping
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
></pagination-daping>
</div>
</template>
@ -132,6 +132,6 @@ export default {
::v-deep .el-table tr,
::v-deep .el-table td {
background-color: transparent !important;
color: #000000;
color: white;
}
</style>

Loading…
Cancel
Save