From e0390205f97847ae8e050873db51b619b7ebcc55 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期三, 12 七月 2023 14:41:41 +0800
Subject: [PATCH] 界面修改
---
public/mapscreen/images/css_1globe_halo.png | 0
public/mapscreen/css/style.css | 14 +
src/components/login.vue | 6
src/assets/img/moon-bg.png | 0
src/router/index.js | 2
src/views/datamanage/bankController.vue | 4
public/mapscreen/images/css_globe_halo.png | 0
public/mapscreen/images/css_globe_diffuse.jpg | 0
src/views/datamanage/dataController.vue | 3
public/mapscreen/images/css_globe_halo.zip | 0
src/views/maintenance/menuSettings.vue | 341 +++++++++++++++++++++++++-----------------------
src/components/navMenu.vue | 15 +
public/mapscreen/images/3css_globe_diffuse.jpg | 0
13 files changed, 210 insertions(+), 175 deletions(-)
diff --git a/public/mapscreen/css/style.css b/public/mapscreen/css/style.css
index 7a91a2b..eccd741 100644
--- a/public/mapscreen/css/style.css
+++ b/public/mapscreen/css/style.css
@@ -1,4 +1,5 @@
-html, body {
+html,
+body {
position: absolute;
width: 100%;
height: 100%;
@@ -55,13 +56,20 @@
}
.world-globe-halo {
- position: absolute;
+ /* position: absolute;
left: 50%;
top: 50%;
width: 730px;
height: 715px;
margin-left: -368px;
- margin-top: -350px;
+ margin-top: -350px; */
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ width: 730px;
+ height: 681px;
+ margin-left: -368px;
+ margin-top: -324px;
}
.info {
diff --git a/public/mapscreen/images/3css_globe_diffuse.jpg b/public/mapscreen/images/3css_globe_diffuse.jpg
new file mode 100644
index 0000000..e34c48c
--- /dev/null
+++ b/public/mapscreen/images/3css_globe_diffuse.jpg
Binary files differ
diff --git a/public/mapscreen/images/css_1globe_halo.png b/public/mapscreen/images/css_1globe_halo.png
new file mode 100644
index 0000000..8800956
--- /dev/null
+++ b/public/mapscreen/images/css_1globe_halo.png
Binary files differ
diff --git a/public/mapscreen/images/css_globe_diffuse.jpg b/public/mapscreen/images/css_globe_diffuse.jpg
index e34c48c..8c2e922 100644
--- a/public/mapscreen/images/css_globe_diffuse.jpg
+++ b/public/mapscreen/images/css_globe_diffuse.jpg
Binary files differ
diff --git a/public/mapscreen/images/css_globe_halo.png b/public/mapscreen/images/css_globe_halo.png
index 8800956..5e75190 100644
--- a/public/mapscreen/images/css_globe_halo.png
+++ b/public/mapscreen/images/css_globe_halo.png
Binary files differ
diff --git a/public/mapscreen/images/css_globe_halo.zip b/public/mapscreen/images/css_globe_halo.zip
new file mode 100644
index 0000000..9500bdb
--- /dev/null
+++ b/public/mapscreen/images/css_globe_halo.zip
Binary files differ
diff --git a/src/assets/img/moon-bg.png b/src/assets/img/moon-bg.png
new file mode 100644
index 0000000..c5f6132
--- /dev/null
+++ b/src/assets/img/moon-bg.png
Binary files differ
diff --git a/src/components/login.vue b/src/components/login.vue
index 75e84bb..68a1963 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -221,8 +221,8 @@
debugger
if (res.result.length != 0) {
sessionStorage.setItem("routerName", "/Thematic");
- sessionStorage.setItem("changeSelectStyle", 1);
- this.$router.push("/bankController");
+ sessionStorage.setItem("changeSelectStyle", 0);
+ this.$router.push("/projectController");
} else {
this.$message({
message: "璇锋偍鑱旂郴绠＄悊鍛樺垎閰嶈鑹茶彍鍗�",
@@ -307,7 +307,7 @@
right: 0px;
bottom: 0px;
- background: url("../assets/img/login.jpg") no-repeat center;
+ background: url("../assets/img/moon-bg.png") no-repeat center;
background-size: 100% 100%;
.MapMenu {
width: 100%;
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index 76c4e0a..534ef32 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -31,6 +31,7 @@
<div
class="secondMenuDiv subpage_Div"
v-show="index == showFlag ? true :false"
+ v-if="item.children && item.children.length>0"
>
<div
v-for="res in item.children"
@@ -221,7 +222,7 @@
},
//榧犳爣绉诲叆鑿滃崟浜嬩欢
setMenuMove(index, item) {
-
+ debugger
if (item.perms != null && item.perms != "") {
this.$router.push(item.url);
if (this.showFlag != null) {
@@ -229,8 +230,8 @@
this.changeliSelect = '%%';
this.showFlag = null;
}
- if (item.url == "Thematic") {
- this.signInsertOpLog("缁煎悎灞曠ず", item.cnName)
+ if (item.url == "/projectController") {
+ this.signInsertOpLog("椤圭洰绠＄悊", item.cnName)
}
this.changeSelectStyle = index;
@@ -238,6 +239,12 @@
} else {
if (this.showFlag != index) {
this.showFlag = index;
+ this.changeSelectStyle = index;
+
+
+ if (item.url && item.children && item.children.length == 0) {
+ window.open(item.url)
+ }
} else {
this.showFlag = null;
}
@@ -333,7 +340,7 @@
if (res[i].perms == null || res[i].perms == "") {
const result = await selectMenuRecursive({ id: res[i].id });
-
+ debugger
if (result.code == 200) {
res[i].children = result.result.filter((value) => {
diff --git a/src/router/index.js b/src/router/index.js
index c3b608b..0a579b8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -96,7 +96,7 @@
path: '/',
name: 'Home',
component: Home,
- redirect: '/Synthesis',
+ redirect: '/projectController',
children: [
{
path: '/WareInspection',
diff --git a/src/views/datamanage/bankController.vue b/src/views/datamanage/bankController.vue
index 4943f3b..3df50b8 100644
--- a/src/views/datamanage/bankController.vue
+++ b/src/views/datamanage/bankController.vue
@@ -156,9 +156,11 @@
const data = await queryMenuTree();
let menuLists = data.result.filter((value) => {
+
return value.url == '/bankController';
});
-
+ if (menuLists.length <= 0) return
+ debugger
const res = await selectMenuRecursive({ id: menuLists[0].id });
if (res.code == 200) {
diff --git a/src/views/datamanage/dataController.vue b/src/views/datamanage/dataController.vue
index 97d877c..e1de156 100644
--- a/src/views/datamanage/dataController.vue
+++ b/src/views/datamanage/dataController.vue
@@ -96,6 +96,7 @@
},
created() { },
mounted() {
+ debugger
this.getTreeData();
//宸﹀彸鎷栧嫊
this.dragControllerDiv();
@@ -153,7 +154,7 @@
let menuLists = data.result.filter((value) => {
return value.url == '/dataController';
});
-
+ debugger
const res = await selectMenuRecursive({ id: menuLists[0].id });
if (res.code == 200) {
diff --git a/src/views/maintenance/menuSettings.vue b/src/views/maintenance/menuSettings.vue
index 0a89703..91c87c4 100644
--- a/src/views/maintenance/menuSettings.vue
+++ b/src/views/maintenance/menuSettings.vue
@@ -25,7 +25,10 @@
</div>
<div class="right_menu subpage_Div">
<div style="display:flex;justify-content:right;align-items: center;padding-bottom: 14px">
- <el-breadcrumb separator="/" style="display: none">
+ <el-breadcrumb
+ separator="/"
+ style="display: none"
+ >
<el-breadcrumb-item :to="{ path: '/' }">{{
$t('dataManage.dictionaryManageObj.particulars')
}}</el-breadcrumb-item>
@@ -76,7 +79,7 @@
</div>
<div class="dividing-line"></div>
-<!-- <el-divider />-->
+ <!-- <el-divider />-->
<div class="form_box">
<el-form
:model="itemdetail"
@@ -107,16 +110,16 @@
autocomplete="off"
></el-input>
</el-form-item>
-<!-- <el-form-item-->
-<!-- :label="$t('operatManage.menuSetObj.icon')"-->
-<!-- :label-width="formLabelWidth"-->
-<!-- >-->
-<!-- <el-input-->
-<!-- v-model="itemdetail.icon"-->
-<!-- :placeholder="$t('operatManage.menuSetObj.iconHolder')"-->
-<!-- autocomplete="off"-->
-<!-- ></el-input>-->
-<!-- </el-form-item>-->
+ <!-- <el-form-item-->
+ <!-- :label="$t('operatManage.menuSetObj.icon')"-->
+ <!-- :label-width="formLabelWidth"-->
+ <!-- >-->
+ <!-- <el-input-->
+ <!-- v-model="itemdetail.icon"-->
+ <!-- :placeholder="$t('operatManage.menuSetObj.iconHolder')"-->
+ <!-- autocomplete="off"-->
+ <!-- ></el-input>-->
+ <!-- </el-form-item>-->
<el-form-item
prop="isShow"
:label="$t('operatManage.menuSetObj.isShow')"
@@ -128,15 +131,21 @@
v-model="itemdetail.isShow"
:placeholder="$t('operatManage.menuSetObj.show')"
>
- <el-option :label="$t('operatManage.menuSetObj.hiddeen')" value="0" />
- <el-option :label="$t('operatManage.menuSetObj.isshow')" value="1" />
-<!-- <el-option-->
-<!-- v-for="item in options1"-->
-<!-- :key="item.value"-->
-<!-- :label="item.label"-->
-<!-- :value="item.value"-->
-<!-- >-->
-<!-- </el-option>-->
+ <el-option
+ :label="$t('operatManage.menuSetObj.hiddeen')"
+ value="0"
+ />
+ <el-option
+ :label="$t('operatManage.menuSetObj.isshow')"
+ value="1"
+ />
+ <!-- <el-option-->
+ <!-- v-for="item in options1"-->
+ <!-- :key="item.value"-->
+ <!-- :label="item.label"-->
+ <!-- :value="item.value"-->
+ <!-- >-->
+ <!-- </el-option>-->
</el-select>
</el-form-item>
<el-form-item
@@ -170,16 +179,25 @@
v-model="itemdetail.type"
:placeholder="$t('operatManage.menuSetObj.typeHolder')"
>
- <el-option :label="$t('operatManage.menuSetObj.rootpath')" value="0" />
- <el-option :label="$t('operatManage.menuSetObj.menu')" value="1" />
- <el-option :label="$t('operatManage.menuSetObj.button')" value="2" />
-<!-- <el-option-->
-<!-- v-for="item in options2"-->
-<!-- :key="item.value"-->
-<!-- :label="item.label"-->
-<!-- :value="item.value"-->
-<!-- >-->
-<!-- </el-option>-->
+ <el-option
+ :label="$t('operatManage.menuSetObj.rootpath')"
+ value="0"
+ />
+ <el-option
+ :label="$t('operatManage.menuSetObj.menu')"
+ value="1"
+ />
+ <el-option
+ :label="$t('operatManage.menuSetObj.button')"
+ value="2"
+ />
+ <!-- <el-option-->
+ <!-- v-for="item in options2"-->
+ <!-- :key="item.value"-->
+ <!-- :label="item.label"-->
+ <!-- :value="item.value"-->
+ <!-- >-->
+ <!-- </el-option>-->
</el-select>
</el-form-item>
<el-form-item
@@ -195,14 +213,14 @@
<div v-if="menuStatus.update">
<el-form-item>
<el-button
- size="small"
- type="primary"
- @click="updMenu('itemdetail')"
+ size="small"
+ type="primary"
+ @click="updMenu('itemdetail')"
>{{ $t('common.confirm') }}</el-button>
<el-button
- size="small"
- type="info"
- @click="reset('itemdetail')"
+ size="small"
+ type="info"
+ @click="reset('itemdetail')"
>{{
$t('common.cancel')
}}</el-button>
@@ -219,123 +237,123 @@
:visible.sync="dialogFormVisible"
:before-close="handleClose"
>
- <div style="height: 500px; overflow: auto">
- <el-form
- :model="ruleForm"
- ref="ruleForm"
- :rules="rules"
- label-position="top"
- >
- <el-form-item
- prop="enName"
- :label="$t('operatManage.menuSetObj.enName')"
- :label-width="formLabelWidth"
+ <div style="height: 500px; overflow: auto">
+ <el-form
+ :model="ruleForm"
+ ref="ruleForm"
+ :rules="rules"
+ label-position="top"
>
- <el-input
- v-model="ruleForm.enName"
- autocomplete="off"
- style="width:85%"
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('operatManage.menuSetObj.enName')"
- ></el-input>
- </el-form-item>
- <el-form-item
- prop="cnName"
- :label="$t('operatManage.menuSetObj.cnName')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="ruleForm.cnName"
- autocomplete="off"
- style="width:85%"
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('operatManage.menuSetObj.cnName')"
- ></el-input>
- </el-form-item>
- <el-form-item
- :label="$t('operatManage.menuSetObj.icon')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="ruleForm.icon"
- autocomplete="off"
- style="width:85%"
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('operatManage.menuSetObj.icon')"
- ></el-input>
- </el-form-item>
- <el-form-item
- prop="isShow"
- :label="$t('operatManage.menuSetObj.isShow')"
- :label-width="formLabelWidth"
- >
- <el-select
- :popper-append-to-body="false"
- style="width:85%"
- v-model="ruleForm.isShow"
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetree')+$t('operatManage.menuSetObj.isShow')"
+ <el-form-item
+ prop="enName"
+ :label="$t('operatManage.menuSetObj.enName')"
+ :label-width="formLabelWidth"
>
- <el-option
- v-for="item in options1"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item
- :label="$t('operatManage.menuSetObj.menuUrl')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="ruleForm.url"
- autocomplete="off"
- style="width:85%"
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('operatManage.menuSetObj.menuUrl')"
- ></el-input>
- </el-form-item>
- <el-form-item
- :label="$t('operatManage.menuSetObj.authorize')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="ruleForm.perms"
- autocomplete="off"
- style="width:85%"
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('operatManage.menuSetObj.authorize')"
- ></el-input>
- </el-form-item>
- <el-form-item
- :label="$t('operatManage.menuSetObj.type')"
- prop="type"
- :label-width="formLabelWidth"
- >
- <el-select
- :popper-append-to-body="false"
- style="width:85%"
- v-model="ruleForm.type"
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetree')+$t('operatManage.menuSetObj.type')"
+ <el-input
+ v-model="ruleForm.enName"
+ autocomplete="off"
+ style="width:85%"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('operatManage.menuSetObj.enName')"
+ ></el-input>
+ </el-form-item>
+ <el-form-item
+ prop="cnName"
+ :label="$t('operatManage.menuSetObj.cnName')"
+ :label-width="formLabelWidth"
>
- <el-option
- v-for="item in options2"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ <el-input
+ v-model="ruleForm.cnName"
+ autocomplete="off"
+ style="width:85%"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('operatManage.menuSetObj.cnName')"
+ ></el-input>
+ </el-form-item>
+ <el-form-item
+ :label="$t('operatManage.menuSetObj.icon')"
+ :label-width="formLabelWidth"
+ >
+ <el-input
+ v-model="ruleForm.icon"
+ autocomplete="off"
+ style="width:85%"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('operatManage.menuSetObj.icon')"
+ ></el-input>
+ </el-form-item>
+ <el-form-item
+ prop="isShow"
+ :label="$t('operatManage.menuSetObj.isShow')"
+ :label-width="formLabelWidth"
+ >
+ <el-select
+ :popper-append-to-body="false"
+ style="width:85%"
+ v-model="ruleForm.isShow"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetree')+$t('operatManage.menuSetObj.isShow')"
>
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item
- :label="$t('operatManage.menuSetObj.bak')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="ruleForm.bak"
- autocomplete="off"
- style="width:85%"
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('operatManage.menuSetObj.bak')"
- ></el-input>
- </el-form-item>
- </el-form>
- </div>
+ <el-option
+ v-for="item in options1"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ :label="$t('operatManage.menuSetObj.menuUrl')"
+ :label-width="formLabelWidth"
+ >
+ <el-input
+ v-model="ruleForm.url"
+ autocomplete="off"
+ style="width:85%"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('operatManage.menuSetObj.menuUrl')"
+ ></el-input>
+ </el-form-item>
+ <el-form-item
+ :label="$t('operatManage.menuSetObj.authorize')"
+ :label-width="formLabelWidth"
+ >
+ <el-input
+ v-model="ruleForm.perms"
+ autocomplete="off"
+ style="width:85%"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('operatManage.menuSetObj.authorize')"
+ ></el-input>
+ </el-form-item>
+ <el-form-item
+ :label="$t('operatManage.menuSetObj.type')"
+ prop="type"
+ :label-width="formLabelWidth"
+ >
+ <el-select
+ :popper-append-to-body="false"
+ style="width:85%"
+ v-model="ruleForm.type"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetree')+$t('operatManage.menuSetObj.type')"
+ >
+ <el-option
+ v-for="item in options2"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ :label="$t('operatManage.menuSetObj.bak')"
+ :label-width="formLabelWidth"
+ >
+ <el-input
+ v-model="ruleForm.bak"
+ autocomplete="off"
+ style="width:85%"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('operatManage.menuSetObj.bak')"
+ ></el-input>
+ </el-form-item>
+ </el-form>
+ </div>
<div
slot="footer"
class="dialog-footer"
@@ -372,9 +390,9 @@
data() {
return {
menuStatus: {
- delete: false,
- insert: false,
- update: false,
+ delete: true,
+ insert: true,
+ update: true,
},
defaultProps: {
children: 'children',
@@ -413,7 +431,7 @@
type: null,
bak: '',
},
- rules : {
+ rules: {
enName: [
{ required: true, message: this.$t('operatManage.menuSetObj.enNameHolder'), trigger: 'blur' },
],
@@ -439,27 +457,27 @@
options1: [
{
value: 0,
- label:this.$t('operatManage.menuSetObj.hiddeen')
+ label: this.$t('operatManage.menuSetObj.hiddeen')
},
{
value: 1,
- label:this.$t('operatManage.menuSetObj.isshow')
+ label: this.$t('operatManage.menuSetObj.isshow')
},
],
options2: [
{
value: 0,
- label:this.$t('operatManage.menuSetObj.rootpath')
+ label: this.$t('operatManage.menuSetObj.rootpath')
// label: '鏍圭洰褰�',
},
{
value: 1,
- label:this.$t('operatManage.menuSetObj.menu')
+ label: this.$t('operatManage.menuSetObj.menu')
// label: '鑿滃崟',
},
{
value: 2,
- label:this.$t('operatManage.menuSetObj.button')
+ label: this.$t('operatManage.menuSetObj.button')
// label: '鎸夐挳',
},
],
@@ -903,7 +921,7 @@
border-radius: 5px;
padding: 1%;
overflow-y: auto;
- border-right: 1px solid #dcdfe6;
+ border-right: 1px solid #dcdfe6;
}
.right_menu {
width: 80%;
@@ -922,8 +940,7 @@
}
}
}
-.btnBox{
-
+.btnBox {
position: absolute;
bottom: 0;
right: 0;
--
Gitblit v1.9.3