mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

暂存导航栏调整

Browse Source
This commit is contained in:
朱菊兰
2024-08-02 16:05:37 +08:00
parent 69aaacb1c7
commit ad7ef729d0
12 changed files with 242 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/abnormalWarning/components/NavbarRight.vue
View File

@@ -1,15 +1,11 @@
<template>
<div class="right-msg" :style="blackTitle ? 'color: #000' : 'color: #fff'">
<div class="home-icon" v-if="blackTitle">
<!-- <svg-icon
icon-class="home"
style="font-size: 24px; cursor: pointer"
@click="toHome" /> -->
<!-- <div class="home-icon" v-if="blackTitle">
<svg-icon
icon-class="alarm"
style="font-size: 24px; cursor: pointer"
@click="toHome" />
</div>
</div> -->
<!-- <div class="time-msg">
<div class="line1">{{timeZone}}&nbsp;&nbsp;&nbsp;&nbsp;{{topTime}}</div>
<div class="line2">{{topDate}}</div>

6
src/views/abnormalWarning/components/TopNav.vue
View File

@@ -204,6 +204,12 @@ export default {
</script>
<style lang="scss">
.warnmenu-container.el-menu.el-menu--horizontal > .el-menu-item.is-active {
border-bottom: none !important;
}
.warnmenu-container.el-menu.el-menu--horizontal > .el-submenu.is-active {
--theme: none !important;
}
.warnmenu-container.el-menu--horizontal > .el-menu-item {
float: left;
height: 84px !important;

153
src/views/abnormalWarning/index.vue
View File

@@ -2,23 +2,137 @@
<div class="warning-page">
<navbar />
<div class="main-box">
<div>异常警告</div>
<div class="title">
<span></span>
异常警告
<div class="return-home" @click="toHome">
<svg-icon
icon-class="alarm-home"
style="font-size: 20px; position: relative; top: 2px" />
返回首页
</div>
</div>
<search-bar
:formConfigs="formConfig"
removeBlue
ref="searchBarForm"
@headBtnClick="buttonClick" />
<base-table
:page="1"
:limit="100000"
:table-props="tableProps"
:table-data="list"
:max-height="tableH" />
</div>
<div class="footer">
<img src="../../assets/img/alarm-bg.png" alt="" />
<div>&copy; 中建材智能自动化研究院有限公司</div>
</div>
</div>
</template>
<script>
import Navbar from './components/Navbar';
import moment from 'moment';
import tableHeightMixin from '@/mixins/tableHeightMixin';
export default {
name: 'AbnormalWarning',
mixins: [tableHeightMixin],
components: { Navbar },
data() {
return {};
return {
formConfig: [
{
type: 'input',
label: '报警来源',
placeholder: '报警来源',
param: 'content',
},
{
type: 'select',
label: '时间段',
selectOptions: [],
labelField: 'name',
valueField: 'id',
param: 'typeId',
filterable: true,
},
{
type: 'select',
label: '报警级别',
selectOptions: [],
labelField: 'name',
valueField: 'id',
param: 'typeId',
filterable: true,
},
{
type: 'button',
btnName: '查询',
name: 'search',
color: 'primary',
},
],
heightNum: 280,
tableProps: [
{
prop: 'createTime',
label: '报警时间',
width: 180,
filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
},
{
prop: 'productionLineName1',
label: '报警来源',
showOverflowtooltip: true,
},
{
prop: 'productionLineName2',
label: '报警类型',
showOverflowtooltip: true,
},
{
prop: 'productionLineName3',
label: '报警级别',
showOverflowtooltip: true,
},
{
prop: 'productionLineName4',
label: '报警原因',
showOverflowtooltip: true,
},
{
prop: 'sectionName5',
label: '报警详情',
showOverflowtooltip: true,
},
],
list: [
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
{ productionLineName: 1 },
],
};
},
created() {},
methods: {},
methods: {
buttonClick(val) {},
toHome() {
this.$router.push({ path: '/' });
},
},
};
</script>
<style lang="scss" scoped>
@@ -34,6 +148,29 @@ export default {
margin: 16px auto 0;
z-index: 10;
padding: 24px 32px;
.title {
font-size: 16px;
color: #000000;
position: relative;
cursor: pointer;
span {
display: inline-block;
float: left;
width: 4px;
height: 16px;
background-color: #0b58ff;
border-radius: 1px;
margin-right: 8px;
margin-top: 4px;
}
.return-home {
position: absolute;
color: rgba(0, 0, 0, 0.3);
font-size: 14px;
right: 0px;
top: 0px;
}
}
}
.footer {
position: fixed;
@@ -44,6 +181,16 @@ export default {
width: 100%;
height: 220px;
}
div {
width: 100%;
color: red;
position: absolute;
bottom: 10px;
text-align: center;
font-size: 12px;
color: #c7c7c7;
letter-spacing: 1px;
}
}
}
</style>

2
src/views/home/components/Navbar.vue
View File

@@ -16,7 +16,7 @@
<top-nav id="homemenu-container" class="homemenu-container" v-if="topNav" />
<div style="padding-top: 5px; padding-right: 38px">
<div style="padding-top: 5px; padding-right: 24px">
<navbar-right :blackTitle="true" />
</div>
</div>

12
src/views/home/components/NavbarRight.vue
View File

@@ -8,7 +8,7 @@
<svg-icon
icon-class="home-alarm-white"
style="font-size: 24px; cursor: pointer"
@click="toHome" />
@click="toAlarm" />
</div>
<!-- <div class="time-msg">
<div class="line1">{{timeZone}}&nbsp;&nbsp;&nbsp;&nbsp;{{topTime}}</div>
@@ -70,9 +70,9 @@ export default {
this.getUserMsg();
// this.getTime();
},
beforeDestroy() {
clearInterval(this.timer);
},
// beforeDestroy() {
// clearInterval(this.timer);
// },
methods: {
// getTime() {
// let _this = this;
@@ -99,8 +99,8 @@ export default {
})
.catch(() => {});
},
toHome() {
this.$router.push({ path: '/' });
toAlarm() {
this.$router.push({ path: '/abnormalWarning' });
},
},
};

3
src/views/home/components/TopNav.vue
View File

@@ -204,6 +204,9 @@ export default {
</script>
<style lang="scss">
.homemenu-container.el-menu.el-menu--horizontal > .el-submenu.is-active {
--theme: none !important;
}
.homemenu-container.el-menu--horizontal > .el-menu-item {
float: left;
height: 84px !important;

38
src/views/home/index.vue
View File

@@ -20,8 +20,10 @@
</el-tabs>
<div class="current-date">(6.13-6.20)</div>
<div class="current-time">
<span style="display: inline-block; margin-right: 16px">03:12AM</span>
<span>2020.12.24</span>
<span style="display: inline-block; margin-right: 16px">
{{ topTime + timeZone }}
</span>
<span>{{ topDate }}</span>
</div>
</div>
<el-row class="main-top" :gutter="16">
@@ -169,6 +171,9 @@ export default {
data() {
return {
activeName: '日',
topDate: '',
topTime: '',
timeZone: '',
middleMenu: [
{ name: '工单管理', url: '', icon: 'home-work-menu' },
{ name: '订单管理', url: '', icon: 'home-order-menu' },
@@ -226,8 +231,23 @@ export default {
],
};
},
created() {},
methods: {},
created() {
this.getTime();
},
beforeDestroy() {
clearInterval(this.timer);
},
methods: {
getTime() {
let _this = this;
this.timer = setInterval(function () {
_this.topDate = moment().format('YYYY.MM.DD');
let temp = moment().format('A-hh:mm').split('-');
_this.timeZone = temp[0];
_this.topTime = temp[1];
}, 1000);
},
},
};
</script>
@@ -241,7 +261,7 @@ export default {
width: 100%;
}
.date-tabs {
padding-left: 24px;
padding-left: 40px;
padding-top: 20px;
position: relative;
}
@@ -279,12 +299,12 @@ export default {
color: #fff;
font-size: 18px;
position: absolute;
right: 24px;
right: 38px;
top: 14px;
}
.main-top {
width: 100%;
padding: 0 8px 0 24px;
padding: 0 20px 0 40px;
.title {
position: absolute;
left: 34px;
@@ -328,7 +348,7 @@ export default {
background-color: #fff;
border-radius: 24px;
height: 133px;
margin: 16px 24px;
margin: 16px 38px 16px 40px;
padding-top: 15px;
.item {
width: 20%;
@@ -374,7 +394,7 @@ export default {
}
.main-bottom {
width: 100%;
padding: 0 8px 0 24px;
padding: 0 20px 0 40px;
.box {
background-color: #fff;
border-radius: 24px;