Commit 7263d144 authored by 夏敏伟's avatar 夏敏伟

修改tree以及选中框样式 系统名称改为从服务中调取

parent e58b491b
......@@ -99,3 +99,11 @@ export function queryReport(pageNum, pageSize, name, startTime, endTime) {
url += addParam({ pageNum, pageSize, name, startTime, endTime });
return get(url);
}
/**
* 查询系统名称
*/
export function querySystemName() {
let url = `api/rest/3z/dictitem/queryDictItem/06`;
return get(url);
}
\ No newline at end of file
......@@ -297,12 +297,15 @@ export default {
.checkDiv {
position: absolute;
bottom: 20px;
bottom: 10px;
background: #7f7f7f17;
display: flex;
flex-wrap: wrap;
gap: 7px 12px;
width: calc(100% - 60px);
width: calc(100% - 40px);
max-height: 90px;
overflow-y: auto;
box-sizing: border-box;
padding: 10px 10px 14px;
}
......
......@@ -80,9 +80,10 @@ import "../assets/css/home.css";
// import jh from "/static/img/main/logo.png";
import { endLoading, get, post, httpSSERequest, fetchEventSource, httpSSERequestPoly } from "../util/http_util";
import { queryDictItem } from '../api/dictitem';
import { querySystemName } from '@/api/index';
import Push from 'push.js'
import dayjs from 'dayjs';
import { SYSTEM_NAME, MAIL_ADDRESS } from "@/constant/user";
import { MAIL_ADDRESS } from "@/constant/user";
export default {
name: "home",
data() {
......@@ -123,7 +124,7 @@ export default {
day: null,
week: null
},
system_name: SYSTEM_NAME
system_name: ''
};
},
methods: {
......@@ -315,6 +316,11 @@ export default {
}, (err) => {
console.log(err)
});
querySystemName().then(res => {
res.forEach(item => {
this.system_name += item.name;
});
})
},
computed: {
userInfo() {
......
......@@ -9,15 +9,15 @@
</div>
<div class="content">
<div class="left-content">
<div class="leftModule bk-homeapge-animation" v-for="(item,index) in modules.leftModule">
<div :class="['module-info', isSelected == item.id ? ('selectedModule-left'+index) : '','left-div-'+index]"
<div class="leftModule bk-homeapge-animation" v-for="(item, index) in modules.leftModule">
<div :class="['module-info', isSelected == item.id ? ('selectedModule-left' + index) : '', 'left-div-' + index]"
@click="choiceModule(item.id)">
<div class="info-description">
<div v-text="item.title"></div>
<div v-text="item.eg"></div>
</div>
</div>
<div style="position: absolute;top:50%;right: 3.1%;" :id="'left'+index"></div>
<div style="position: absolute;top:50%;right: 3.1%;" :id="'left' + index"></div>
</div>
</div>
<div class="center-content">
......@@ -33,15 +33,15 @@
<div style="position: absolute;top:56%;right: calc(50% - 250px);" id="right33"></div>
</div>
<div class="right-content">
<div class="rightModule bk-homeapge-animation" v-for="(item,index) in modules.rightModule">
<div :class="['module-info', isSelected == item.id ? ('selectedModule-right'+index) : '','right-div-'+index]"
<div class="rightModule bk-homeapge-animation" v-for="(item, index) in modules.rightModule">
<div :class="['module-info', isSelected == item.id ? ('selectedModule-right' + index) : '', 'right-div-' + index]"
@click="choiceModule(item.id)">
<div class="info-description">
<div v-text="item.title"></div>
<div v-text="item.eg"></div>
</div>
</div>
<div style="position: absolute;top:50%;left: 3.1%;" :id="'right'+index"></div>
<div style="position: absolute;top:50%;left: 3.1%;" :id="'right' + index"></div>
</div>
</div>
</div>
......@@ -51,7 +51,7 @@
<script>
import LeaderLine from "../util/leader-line.min";
import dayjs from 'dayjs';
import { SYSTEM_NAME } from "@/constant/user";
import { querySystemName } from '@/api/index';
export default {
name: 'homepage',
data() {
......@@ -69,29 +69,29 @@ export default {
{ id: 6, title: '新技术实验模块', eg: 'New Technology Experiment Module' },
]
},
line1:null,
line2:null,
line3:null,
line4:null,
line5:null,
line6:null,
myDate:{
day:null,
week:null
line1: null,
line2: null,
line3: null,
line4: null,
line5: null,
line6: null,
myDate: {
day: null,
week: null
},
system_name: SYSTEM_NAME
system_name: ''
}
},
methods: {
choiceModule(id) {
let arr = this.query_selector('.leader-line');
if(arr.length>0){
if (arr.length > 0) {
arr.forEach(element => {
element.remove();
});
}
this.isSelected = id;
this.$store.commit("activeIndex", id-1);
this.$store.commit("activeIndex", id - 1);
this.$router.push("/");
},
query_selector(selector) {
......@@ -104,57 +104,64 @@ export default {
startPlugColor: '#1a9ee0',
endPlugColor: '#00cda0',
gradient: true,
size:2,
dash: {animation: true},
endPlug:'behind',
size: 2,
dash: { animation: true },
endPlug: 'behind',
}
const styleOption1 = {
...styleOption,
startSocket:'right',
endSocket:'left'
startSocket: 'right',
endSocket: 'left'
}
const styleOption2 = {
...styleOption,
startSocket:'left',
endSocket:'right'
startSocket: 'left',
endSocket: 'right'
}
this.line1 = new LeaderLine( {
this.line1 = new LeaderLine({
...styleOption1,
start:document.getElementById('left0'),
end:document.getElementById('left11'),
start: document.getElementById('left0'),
end: document.getElementById('left11'),
});
this.line2 = new LeaderLine( {
this.line2 = new LeaderLine({
...styleOption1,
start:document.getElementById('left1'),
end:document.getElementById('left22'),
start: document.getElementById('left1'),
end: document.getElementById('left22'),
});
this.line3 = new LeaderLine( {
this.line3 = new LeaderLine({
...styleOption1,
start:document.getElementById('left2'),
end:document.getElementById('left33'),
start: document.getElementById('left2'),
end: document.getElementById('left33'),
});
this.line4 = new LeaderLine( {
this.line4 = new LeaderLine({
...styleOption2,
start:document.getElementById('right0'),
end:document.getElementById('right11'),
start: document.getElementById('right0'),
end: document.getElementById('right11'),
});
this.line5 = new LeaderLine( {
this.line5 = new LeaderLine({
...styleOption2,
start:document.getElementById('right1'),
end:document.getElementById('right22'),
start: document.getElementById('right1'),
end: document.getElementById('right22'),
});
this.line6 = new LeaderLine( {
this.line6 = new LeaderLine({
...styleOption2,
start:document.getElementById('right2'),
end:document.getElementById('right33'),
start: document.getElementById('right2'),
end: document.getElementById('right33'),
});
})
//获取时间
this.myDate.day = dayjs().format('YYYY年MM月DD日');
const weekList = ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'];
const weekList = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
this.myDate.week = weekList[dayjs().get('day')]
},
mounted() {
querySystemName().then(res => {
res.forEach(item => {
this.system_name += item.name;
});
})
}
}
</script>
......@@ -181,7 +188,8 @@ export default {
margin-bottom: 0px !important;
font-family: cursive;
text-align: center;
span{
span {
background-image: linear-gradient(to right, #498ce1, #75f8d2, #498ce1);
color: transparent;
-webkit-background-clip: text;
......@@ -223,15 +231,19 @@ export default {
background-size: 100% 100%;
background-repeat: no-repeat;
position: relative;
.left-div-0{
.left-div-0 {
background-image: url('../assets/img/homepage/index0.png');
}
.left-div-1{
.left-div-1 {
background-image: url('../assets/img/homepage/index1.png');
}
.left-div-2{
.left-div-2 {
background-image: url('../assets/img/homepage/index2.png');
}
.module-info {
width: 100%;
height: 100%;
......@@ -259,6 +271,7 @@ export default {
.selectedModule-left0 {
background-image: url('../assets/img/homepage/index0-0.png');
.info-description {
&>div:first-child {
color: orange;
......@@ -268,6 +281,7 @@ export default {
.selectedModule-left1 {
background-image: url('../assets/img/homepage/index1-0.png');
.info-description {
&>div:first-child {
color: orange;
......@@ -277,6 +291,7 @@ export default {
.selectedModule-left2 {
background-image: url('../assets/img/homepage/index2-0.png');
.info-description {
&>div:first-child {
color: orange;
......@@ -293,6 +308,7 @@ export default {
justify-content: center;
align-items: center;
position: relative;
.center-img {
width: 500px;
max-width: 500px;
......@@ -321,6 +337,7 @@ export default {
}
}
}
.pulse {
position: absolute;
width: 500px;
......@@ -337,8 +354,10 @@ export default {
-webkit-animation-iteration-count: infinite;
-moz-animation-iteration-count: infinite;
animation-iteration-count: infinite;
box-shadow: 1px 1px 30px #50a2f5; /* 阴影效果 */
box-shadow: 1px 1px 30px #50a2f5;
/* 阴影效果 */
}
.pulse1 {
position: absolute;
width: 500px;
......@@ -355,8 +374,10 @@ export default {
-webkit-animation-iteration-count: infinite;
-moz-animation-iteration-count: infinite;
animation-iteration-count: infinite;
box-shadow: 1px 1px 30px #3399ff; /* 阴影效果 */
box-shadow: 1px 1px 30px #3399ff;
/* 阴影效果 */
}
.pulse2 {
position: absolute;
width: 500px;
......@@ -373,11 +394,20 @@ export default {
-webkit-animation-iteration-count: infinite;
-moz-animation-iteration-count: infinite;
animation-iteration-count: infinite;
box-shadow: 1px 1px 30px #3399ff; /* 阴影效果 */
box-shadow: 1px 1px 30px #3399ff;
/* 阴影效果 */
}
@keyframes warn {
from { opacity:0.5; transform:scale(0); }
to { opacity:0; transform:scale(1); }
from {
opacity: 0.5;
transform: scale(0);
}
to {
opacity: 0;
transform: scale(1);
}
}
.right-content {
......@@ -395,15 +425,18 @@ export default {
background-repeat: no-repeat;
position: relative;
.right-div-0{
.right-div-0 {
background-image: url('../assets/img/homepage/index10.png');
}
.right-div-1{
.right-div-1 {
background-image: url('../assets/img/homepage/index11.png');
}
.right-div-2{
.right-div-2 {
background-image: url('../assets/img/homepage/index12.png');
}
.module-info {
width: 100%;
height: 100%;
......@@ -429,8 +462,10 @@ export default {
}
}
}
.selectedModule-right0 {
background-image: url('../assets/img/homepage/index10-0.png');
.info-description {
&>div:first-child {
color: orange;
......@@ -440,6 +475,7 @@ export default {
.selectedModule-right1 {
background-image: url('../assets/img/homepage/index11-0.png');
.info-description {
&>div:first-child {
color: orange;
......@@ -449,6 +485,7 @@ export default {
.selectedModule-right2 {
background-image: url('../assets/img/homepage/index12-0.png');
.info-description {
&>div:first-child {
color: orange;
......@@ -460,6 +497,7 @@ export default {
.bk-homeapge-animation {
position: relative;
&::before {
content: "";
position: absolute;
......@@ -488,6 +526,7 @@ export default {
}
@keyframes clippathss {
0%,
100% {
clip-path: inset(0 0 95% 0);
......
......@@ -46,8 +46,8 @@ import leftOne from '../assets/img/login/text1.png';
import leftTwo from '../assets/img/login/text2.png';
import rightOne from '../assets/img/login/text3.png';
import rightTwo from '../assets/img/login/text4.png';
import { querySystemName } from '@/api/index';
import dayjs from "dayjs";
import { SYSTEM_NAME } from "@/constant/user";
export default {
name: "login",
data() {
......@@ -70,7 +70,7 @@ export default {
day: null,
week: null
},
system_name: SYSTEM_NAME
system_name: ''
};
},
methods: {
......@@ -128,6 +128,13 @@ export default {
this.myDate.day = dayjs().format('YYYY年MM月DD日');
const weekList = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
this.myDate.week = weekList[dayjs().get('day')]
},
mounted(){
querySystemName().then(res=>{
res.forEach(item=>{
this.system_name+=item.name;
});
})
}
};
</script>
......
......@@ -372,12 +372,15 @@ export default {
float: left;
.checkDiv{
position: absolute;
max-height: 100px;
overflow-y: auto;
bottom: 20px;
background: #7f7f7f17;
display: flex;
flex-wrap: wrap;
gap: 7px 12px;
width: 280px;
box-sizing: border-box;
width: 300px;
padding: 10px 10px 14px;
}
.checkList{
......@@ -408,7 +411,7 @@ export default {
.el-tree {
color: white;
background: transparent;
height: calc(100% - 50px);
height: calc(100% - 150px);
margin-top: 10px;
.el-tree-node__content {
......
......@@ -49,7 +49,7 @@
</el-table-column>
<el-table-column prop="file.type" label="文档类型" width="110">
</el-table-column>
<el-table-column prop="file.type" label="所属目录" width="200">
<el-table-column prop="labels" label="标签" width="200">
<template slot-scope="scope">
<span>{{ scope.row.labels.join('') }}</span>
</template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment