From 70b24a3d28f55bfe72c0ddf3246d5af7a69fc623 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期三, 08 二月 2023 18:20:47 +0800
Subject: [PATCH] 资源管理，角色管理，权限管理，权限管理，运维监控主题切换界面优化
---
src/views/PackageTwo/WareInspection.vue | 36 +++--------------
src/views/maintenance/eventlogManage.vue | 3 +
src/views/maintenance/tokentool.vue | 6 +++
src/assets/css/config.css | 11 +++--
src/views/PackageTwo/index.vue | 1
src/views/maintenance/operationLog.vue | 1
src/views/maintenance/downlog.vue | 4 +
src/components/navMenu.vue | 14 ++++---
src/views/maintenance/logLog.vue | 1
9 files changed, 36 insertions(+), 41 deletions(-)
diff --git a/src/assets/css/config.css b/src/assets/css/config.css
index 2261191..504e932 100644
--- a/src/assets/css/config.css
+++ b/src/assets/css/config.css
@@ -200,11 +200,14 @@
color: #FFF !important;
}
-.confirm {
+.Black_theme .el-picker-panel__body {
background: #303030;
-
}
-.confirm p {
- color: white !important;
+.Black_theme .el-tabs__item {
+ color: white;
+}
+
+.Black_theme .el-tabs__item.is-active {
+ color: #1890FF;
}
\ No newline at end of file
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index 470bb2f..031434b 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -213,12 +213,14 @@
setTimeout(() => {
this.changeliSelect = res.cnName;
if (res.url.indexOf('http') != -1) {
- if (location.href.indexOf('/WareInspection') == -1) {
- this.$store.reporturl = res.url;
- this.$router.push('/WareInspection');
- } else {
- this.$bus.$emit('changeNaveUrl', res.url);
- }
+ this.$store.reporturl = res.url;
+ this.$router.push('/QualityInspection');
+ // if (location.href.indexOf('/WareInspection') == -1) {
+ // this.$store.reporturl = res.url;
+ // this.$router.push('/WareInspection');
+ // } else {
+ // this.$bus.$emit('changeNaveUrl', res.url);
+ // }
} else {
this.$store.reporturl = null;
this.$router.push(res.url);
diff --git a/src/views/PackageTwo/WareInspection.vue b/src/views/PackageTwo/WareInspection.vue
index e89b3cf..3cad44b 100644
--- a/src/views/PackageTwo/WareInspection.vue
+++ b/src/views/PackageTwo/WareInspection.vue
@@ -39,36 +39,14 @@
},
methods: {
langreash(res) {
- if (this.url == '') return
- this.reportUrl = ''
- if (res == true) {
- if (this.url.indexOf('theme=white') != -1) {
- this.url = this.url.replace('theme=white', 'theme=dark');
- }
- } else if (res == false) {
- if (this.url.indexOf('theme=dark') != -1) {
- this.url = this.url.replace('theme=dark', 'theme=white');
- }
- }
- this.reportUrl = this.url;
- this.$store.state.reporturl = this.url;
- this.$router.push('/QualityInspection')
+
+ this.$router.push('/QualityInspection')
+
},
refreash(res) {
- if (this.url == '') return
- this.reportUrl = ''
- if (res == true) {
- if (this.url.indexOf('lang=en') != -1) {
- this.url = this.url.replace('lang=en', 'lang=zh');
- }
- } else if (res == false) {
- if (this.url.indexOf('lang=zh') != -1) {
- this.url = this.url.replace('lang=zh', 'lang=en');
- }
- }
- this.reportUrl = this.url;
- this.$store.state.reporturl = this.url;
- this.$router.push('/QualityInspection')
+
+ this.$router.push('/QualityInspection')
+
},
showChangeIfream(res) {
if (this.$store.state.themeflag == true) {
@@ -102,7 +80,7 @@
this.$store.state.reporturl = res;
this.reportUrl = res;
this.url = res
- // console.log("2", this.reportUrl)
+ console.log("2", this.reportUrl)
}
},
mounted() {
diff --git a/src/views/PackageTwo/index.vue b/src/views/PackageTwo/index.vue
index c318480..5810b11 100644
--- a/src/views/PackageTwo/index.vue
+++ b/src/views/PackageTwo/index.vue
@@ -5,6 +5,7 @@
<script>
export default {
mounted(){
+ debugger
// this.$router.push('/QualityInspection')
this.$router.push('/WareInspection')
}
diff --git a/src/views/maintenance/downlog.vue b/src/views/maintenance/downlog.vue
index 94e5bf5..f3774f4 100644
--- a/src/views/maintenance/downlog.vue
+++ b/src/views/maintenance/downlog.vue
@@ -25,6 +25,7 @@
:label="$t('operatManage.operationLogObj.operationType')"
>
<el-select
+ :popper-append-to-body="false"
v-model="sizeForm.type"
:placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
>
@@ -56,6 +57,7 @@
v-model="sizeForm.start"
style="width: 100%"
type="datetime"
+ :popper-class="popperclass"
:placeholder="$t('operatManage.operationLogObj.optionDate')"
></el-date-picker>
</el-form-item>
@@ -169,6 +171,7 @@
data() {
return {
+ popperclass: '',
sizeForm: {
start: null,
end: null,
@@ -314,7 +317,6 @@
width: 300px;
}
.inquire {
- overflow: auto;
padding: 10px;
margin-top: 20px;
diff --git a/src/views/maintenance/eventlogManage.vue b/src/views/maintenance/eventlogManage.vue
index 18cbc8e..c15e925 100644
--- a/src/views/maintenance/eventlogManage.vue
+++ b/src/views/maintenance/eventlogManage.vue
@@ -25,6 +25,7 @@
:label="$t('operatManage.operationLogObj.operationType')"
>
<el-select
+ :popper-append-to-body="false"
clearable
v-model="sizeForm.type"
:placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
@@ -289,7 +290,7 @@
width: 300px;
}
.inquire {
- overflow: auto;
+
padding: 10px;
margin-top: 20px;
diff --git a/src/views/maintenance/logLog.vue b/src/views/maintenance/logLog.vue
index 0ecd8c4..2782c9f 100644
--- a/src/views/maintenance/logLog.vue
+++ b/src/views/maintenance/logLog.vue
@@ -26,6 +26,7 @@
:label="$t('operatManage.operationLogObj.operationType')"
>
<el-select
+ :popper-append-to-body="false"
v-model="sizeForm.type"
:placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
>
diff --git a/src/views/maintenance/operationLog.vue b/src/views/maintenance/operationLog.vue
index 6bde5ba..21fd921 100644
--- a/src/views/maintenance/operationLog.vue
+++ b/src/views/maintenance/operationLog.vue
@@ -26,6 +26,7 @@
:label="$t('operatManage.operationLogObj.operationType')"
>
<el-select
+ :popper-append-to-body="false"
clearable
v-model="sizeForm.type"
:placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
diff --git a/src/views/maintenance/tokentool.vue b/src/views/maintenance/tokentool.vue
index 37c96be..a4ee61b 100644
--- a/src/views/maintenance/tokentool.vue
+++ b/src/views/maintenance/tokentool.vue
@@ -24,6 +24,7 @@
<el-form-item :label="$t('operatManage.tokentoolObj.tokenStatus')">
<el-select
+ :popper-append-to-body="false"
v-model="ruleForm.value"
:placeholder="$t('common.choose')"
>
@@ -216,8 +217,11 @@
:label-width="formLabelWidth"
>
<el-select
+ :popper-append-to-body="false"
+ style="width:94.2%"
v-model="insertform.type"
:placeholder="$t('common.choose')"
+
>
<el-option
value="0"
@@ -290,6 +294,8 @@
:label-width="formLabelWidth"
>
<el-select
+ :popper-append-to-body="false"
+ style="width:94.2%"
v-model="upform.edit"
@change="changeGame"
:placeholder="$t('common.choose')"
--
Gitblit v1.9.3