From 6379e064d1bd765981439c8a31d100c45eb31c2b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 23 六月 2022 10:16:16 +0800
Subject: [PATCH] 1.处理浏览器兼容问题
---
src/views/jcsz/zzjg.vue | 24 +++++--
src/views/jcsz/wldw.vue | 21 ++++++-
src/views/jcsz/yhqd.vue | 19 +++++
src/views/jcsz/jsqd.vue | 24 ++++++-
src/views/sbgl/sbqd.vue | 19 +++++
src/views/template.vue | 26 +++++++-
6 files changed, 111 insertions(+), 22 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 8ed5b4e..3feb640 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -10,7 +10,7 @@
inline
style="display: flex;justify-content: space-between"
>
- <div style="display: flex;justify-content: space-around;width: 85%">
+ <div class="elForm">
<el-form-item label="瑙掕壊缂栫爜" style=" display: flex;">
<el-input v-model="form.RoleCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
</el-form-item>
@@ -1069,7 +1069,7 @@
this.dialogVisibleRight = false
},
// 鏉冮檺瀵硅瘽妗嗙‘璁や簨浠�
- async rightDialogVisibleConfirm() {
+ async rightDialogVisibleConfirm() {
const rightPCArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 PC
const rightAPPArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 APP
@@ -1276,17 +1276,25 @@
height: 30px;
display: flex;
align-items: center;
+ border: 1px solid $main_color;
+ padding: 0 20px;
}
-::v-deep .el-button--info {
+::v-deep .el-button--info{
//background-color: $main_color !important;
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
.footerButton {
@@ -1299,6 +1307,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -1401,7 +1410,7 @@
::v-deep .el-input__inner {
height: 30px;
- line-height:30px;
+ line-height: 30px;
}
::v-deep .el-table .caret-wrapper {
@@ -1462,4 +1471,11 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
}
+
+.elForm {
+ display: flex;
+ justify-content: flex-start;
+ width: 85%;
+ flex-wrap: wrap;
+}
</style>
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 54529c5..0fd1086 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -1,7 +1,7 @@
<template>
<div>
<div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
- <div style="height: 50px;">
+ <div>
<el-form
ref="form"
:model="form"
@@ -9,7 +9,7 @@
inline
style="display: flex;justify-content: space-between"
>
- <div style="display: flex;justify-content: space-around;width: 85%">
+ <div class="elForm">
<el-form-item label="鍗曚綅缂栫爜" style=" display: flex;">
<el-input v-model="form.CuntUnitCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
</el-form-item>
@@ -36,7 +36,7 @@
</div>
</el-form>
</div>
- <div style="margin-bottom: 20px;display: flex">
+ <div style="margin-bottom: 20px;display: flex;z-index: 2">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-upload2">瀵煎叆</el-button>
</div>
@@ -458,6 +458,8 @@
height: 30px;
display: flex;
align-items: center;
+ border: 1px solid $main_color;
+ padding: 0 20px;
}
::v-deep .el-button--info {
@@ -465,10 +467,16 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
.footerButton {
@@ -481,6 +489,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -569,4 +578,10 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
}
+.elForm {
+ display: flex;
+ justify-content: flex-start;
+ width: 85%;
+ flex-wrap: wrap;
+}
</style>
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index fa4d2b0..f7c0952 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -10,7 +10,7 @@
inline
style="display: flex;justify-content: space-between"
>
- <div style="display: flex;justify-content: space-around;width: 85%">
+ <div class="elForm">
<el-form-item label="鐢ㄦ埛缂栫爜" style=" display: flex;">
<el-input v-model="form.UserCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
</el-form-item>
@@ -875,17 +875,25 @@
height: 30px;
display: flex;
align-items: center;
+ border: 1px solid $main_color;
+ padding: 0 20px;
}
-::v-deep .el-button--info {
+::v-deep .el-button--info{
//background-color: $main_color !important;
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
.footerButton {
@@ -898,6 +906,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -1055,4 +1064,10 @@
}
}
+.elForm {
+ display: flex;
+ justify-content: flex-start;
+ width: 85%;
+ flex-wrap: wrap;
+}
</style>
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 5db2047..cae3213 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -10,7 +10,7 @@
inline
style="display: flex;justify-content: space-between"
>
- <div style="display: flex;justify-content: space-around;width: 85%">
+ <div class="elForm">
<el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
<el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
</el-form-item>
@@ -415,17 +415,25 @@
height: 30px;
display: flex;
align-items: center;
+ border: 1px solid $main_color;
+ padding: 0 20px;
}
-::v-deep .el-button--info {
+::v-deep .el-button--info{
//background-color: $main_color !important;
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
.footerButton {
@@ -438,6 +446,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -490,9 +499,10 @@
justify-content: space-between;
align-items: center;
}
-
-//::v-deep .el-message-box__btns button:nth-child(2){
-// background-color: $main_color !important;
-// border-color: $main_color !important;
-//}
+.elForm {
+ display: flex;
+ justify-content: flex-start;
+ width: 85%;
+ flex-wrap: wrap;
+}
</style>
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index f35e4a2..5fe46db 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -9,7 +9,7 @@
inline
style="display: flex;justify-content: space-between"
>
- <div style="display: flex;justify-content: space-around;">
+ <div class="elForm" style="width:100%">
<el-form-item label="璁惧缂栫爜" style=" display: flex;">
<el-input v-model="form.DeviceCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
</el-form-item>
@@ -394,7 +394,7 @@
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
- rows: 10 // 姣忛〉澶氬皯鏉�
+ rows: 20 // 姣忛〉澶氬皯鏉�
},
DeviceTypeArr: [], // 璁惧绫诲瀷涓嬫媺鏁扮粍
StatusArr: [
@@ -655,6 +655,8 @@
height: 30px;
display: flex;
align-items: center;
+ border: 1px solid $main_color;
+ padding: 0 20px;
}
::v-deep .el-button--info {
@@ -662,10 +664,16 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
.footerButton {
@@ -678,6 +686,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -771,4 +780,10 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
}
+.elForm {
+ display: flex;
+ justify-content: flex-start;
+ width: 85%;
+ flex-wrap: wrap;
+}
</style>
diff --git a/src/views/template.vue b/src/views/template.vue
index 2b60672..5a0e09c 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -9,7 +9,7 @@
inline
style="display: flex;justify-content: space-between"
>
- <div style="display: flex;justify-content: space-around;width: 85%">
+ <div class="elForm">
<el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
<el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
</el-form-item>
@@ -411,6 +411,8 @@
height: 30px;
display: flex;
align-items: center;
+ border: 1px solid $main_color;
+ padding: 0 20px;
}
::v-deep .el-button--info {
@@ -418,10 +420,16 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
.footerButton {
@@ -434,6 +442,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -460,7 +469,7 @@
::v-deep .el-input__inner {
height: 30px;
- line-height:30px;
+ line-height: 30px;
}
::v-deep .el-table .caret-wrapper {
@@ -495,20 +504,22 @@
.el-checkbox.is-bordered.is-checked {
border-color: $main_color;
}
+
::v-deep .el-radio__input.is-checked .el-radio__inner {
border-color: $main_color;
background: $main_color;
}
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
border-color: $main_color;
background: $main_color;
}
+
::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
color: $main_color !important;
}
-::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered{
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
margin: 10px 30px 0px 0;
}
@@ -519,4 +530,11 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
}
+
+.elForm {
+ display: flex;
+ justify-content: flex-start;
+ width: 85%;
+ flex-wrap: wrap;
+}
</style>
--
Gitblit v1.9.3