删除无用按钮

看板修改
main
suixy 3 weeks ago
parent aab1d35cd2
commit 4adb748eea

@ -1,6 +1,6 @@
# 页面标题
VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus
VITE_APP_TITLE = RFID中间件监控平台
VITE_APP_LOGO_TITLE = RFID中间件监控平台
# 开发环境配置
VITE_APP_ENV = 'development'
@ -33,4 +33,4 @@ VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
VITE_APP_WEBSOCKET = false
# sse 开关
VITE_APP_SSE = true
VITE_APP_SSE = false

@ -1,6 +1,6 @@
# 页面标题
VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus
VITE_APP_TITLE = RFID中间件监控平台
VITE_APP_LOGO_TITLE = RFID中间件监控平台
# 生产环境配置
VITE_APP_ENV = 'production'
@ -36,4 +36,4 @@ VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
VITE_APP_WEBSOCKET = false
# sse 开关
VITE_APP_SSE = true
VITE_APP_SSE = false

Binary file not shown.

@ -18,3 +18,5 @@ onMounted(() => {
});
});
</script>
<style>
</style>

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

@ -0,0 +1,11 @@
@font-face {
font-family: 'CSD-Block-Bold';
src: url('/fonts/CSD-Block-Bold.ttf') format('truetype');
font-display: swap;
}
/*@font-face {*/
/* font-family: 'CSD-Block-Bold';*/
/* src: url('../chart/csd_bloc1.ttf') format('truetype');*/
/* font-display: swap;*/
/*}*/

@ -21,42 +21,42 @@
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
</el-select>
<search-menu ref="searchMenuRef" />
<el-tooltip content="搜索" effect="dark" placement="bottom">
<div class="right-menu-item hover-effect" @click="openSearchMenu">
<svg-icon class-name="search-icon" icon-class="search" />
</div>
</el-tooltip>
<!-- 消息 -->
<el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">
<div>
<el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
<template #reference>
<el-badge :value="newNotice > 0 ? newNotice : ''" :max="99">
<div class="right-menu-item hover-effect" style="display: block"><svg-icon icon-class="message" /></div>
</el-badge>
</template>
<template #default>
<notice></notice>
</template>
</el-popover>
</div>
</el-tooltip>
<el-tooltip content="Github" effect="dark" placement="bottom">
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip>
<!-- <search-menu ref="searchMenuRef" />-->
<!-- <el-tooltip content="搜索" effect="dark" placement="bottom">-->
<!-- <div class="right-menu-item hover-effect" @click="openSearchMenu">-->
<!-- <svg-icon class-name="search-icon" icon-class="search" />-->
<!-- </div>-->
<!-- </el-tooltip>-->
<!-- &lt;!&ndash; 消息 &ndash;&gt;-->
<!-- <el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">-->
<!-- <div>-->
<!-- <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">-->
<!-- <template #reference>-->
<!-- <el-badge :value="newNotice > 0 ? newNotice : ''" :max="99">-->
<!-- <div class="right-menu-item hover-effect" style="display: block"><svg-icon icon-class="message" /></div>-->
<!-- </el-badge>-->
<!-- </template>-->
<!-- <template #default>-->
<!-- <notice></notice>-->
<!-- </template>-->
<!-- </el-popover>-->
<!-- </div>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip content="Github" effect="dark" placement="bottom">-->
<!-- <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
<!-- </el-tooltip>-->
<el-tooltip :content="proxy.$t('navbar.document')" effect="dark" placement="bottom">
<ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
</el-tooltip>
<!-- <el-tooltip :content="proxy.$t('navbar.document')" effect="dark" placement="bottom">-->
<!-- <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
<!-- </el-tooltip>-->
<el-tooltip :content="proxy.$t('navbar.full')" effect="dark" placement="bottom">
<screenfull id="screenfull" class="right-menu-item hover-effect" />
</el-tooltip>
<el-tooltip :content="proxy.$t('navbar.language')" effect="dark" placement="bottom">
<lang-select id="lang-select" class="right-menu-item hover-effect" />
</el-tooltip>
<!-- <el-tooltip :content="proxy.$t('navbar.language')" effect="dark" placement="bottom">-->
<!-- <lang-select id="lang-select" class="right-menu-item hover-effect" />-->
<!-- </el-tooltip>-->
<el-tooltip :content="proxy.$t('navbar.layoutSize')" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect" />

@ -3,6 +3,7 @@ import { createApp } from 'vue';
import 'virtual:uno.css';
import 'element-plus/theme-chalk/dark/css-vars.css';
import '@/assets/styles/index.scss';
import '@/assets/styles/fontStyle.css';
// App、router、store
import App from './App.vue';

@ -1,6 +1,14 @@
<template>
<div class="content">
<div class="bg"></div>
<div class="logo"></div>
<div class="time">
<div class="time1">{{ time.time }}</div>
<div style="display: inline-block">
<div class="time2">{{ time.week }}</div>
<div class="time3">{{ time.date }}</div>
</div>
</div>
<div class="title">RFID中间件监控平台</div>
<div class="topTitle" style="left: 13%">设备数量:</div>
<div class="topTitle" style="left: 37.5%">在线数量:</div>
@ -51,10 +59,10 @@
</div>
<div class="center" ref="scrollNodeRef" @mouseenter="hover = true" @mouseleave="mouseleave">
<div v-masonry style="width: 100%; height: 100%" ref="masonryRef">
<TreeItem v-masonry-tile :data="i" v-for="i in centerData" :key="i.id" :wsData="wsData"/>
<TreeItem v-masonry-tile :data="i" v-for="i in centerData" :key="i.id" :wsData="wsData" />
</div>
<div v-masonry style="width: 100%; height: 100%">
<TreeItem v-masonry-tile :data="i" v-for="i in centerData" :key="i.id" :wsData="wsData"/>
<TreeItem v-masonry-tile :data="i" v-for="i in centerData" :key="i.id" :wsData="wsData" />
</div>
</div>
</div>
@ -96,6 +104,24 @@ function findParentsWithLocationType3(arr) {
return result;
}
const timeFun = () => {
const now = new Date();
const pad = (n) => String(n).padStart(2, '0');
const time = `${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`;
const weekMap = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
const week = weekMap[now.getDay()];
const date = `${now.getFullYear()}.${pad(now.getMonth() + 1)}.${pad(now.getDate())}`;
return {
time,
week,
date
};
};
const mouseleave = () => {
setTimeout(() => {
hover.value = false;
@ -109,7 +135,10 @@ const classOptions = ref({
step: 1,
hover: true
});
setInterval(() => {
time.value = timeFun();
}, 1000);
const time = ref(timeFun());
const masonryRef = ref(null);
const scrollSeamlessRef = ref(null);
const scrollNodeRef = ref(null);
@ -118,7 +147,7 @@ const hover = ref(false);
const tableData = ref();
const treeData = ref();
const centerData = ref([]);
const wsData = ref({})
const wsData = ref({});
const MenuItem = defineComponent({
name: 'MenuItem',
@ -301,7 +330,7 @@ let data2 = {
'deviceStatus': 2
};
const getSocket = () => {
const socket = new WebSocket('ws://192.168.100.103:7181/ws');
const socket = new WebSocket('ws://192.168.0.16:7181/ws');
socket.addEventListener('open', () => {
// console.log(' WebSocket ');
@ -324,7 +353,7 @@ const getSocket = () => {
onMounted(() => {
getData();
getSocket();
wsData.value[data.deviceId] = data
wsData.value[data.deviceId] = data;
});
</script>
<style scoped lang="less">
@ -347,6 +376,50 @@ onMounted(() => {
background-repeat: no-repeat;
}
.logo {
position: absolute;
top: 5%;
left: 5%;
width: 8vw;
height: 1.91474vw;
background-image: url('@/assets/chart/highwayLogo.png');
background-size: 100% 100%;
background-repeat: no-repeat;
}
.time {
position: absolute;
top: 5%;
right: 5%;
color: #78caf6;
font-family: 'CSD-Block-Bold';
.time1 {
display: inline-block;
white-space: nowrap;
line-height: 2vw;
font-size: 1.6vw;
margin-right: 8px;
vertical-align: top;
font-family: 'CSD-Block-Bold';
font-feature-settings: 'tnum';
}
.time2 {
white-space: nowrap;
line-height: 1vw;
font-size: 0.8vw;
font-family: 'CSD-Block-Bold';
}
.time3 {
white-space: nowrap;
font-size: 0.9vw;
line-height: 1vw;
font-family: 'CSD-Block-Bold';
}
}
.title {
position: absolute;
top: 2vw;

@ -14,7 +14,7 @@
<div class="child-name">
工位名称: <span style="font-size: 12px">{{ child.locationAlias }}</span>
</div>
<div class="child-code">编码{{ wsData[data.deviceId]?.epcStr}}</div>
<div class="child-code">编码{{ wsData[data.deviceId]?.epcStr?.trimStart()}}</div>
<div class="child-time">时间{{ parseTime(wsData[data.deviceId]?.recordTime) }}</div>
</div>
</div>

@ -3,7 +3,7 @@
<el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
<div class="title-box">
<h3 class="title">{{ title }}</h3>
<lang-select />
<!-- <lang-select />-->
</div>
<el-form-item v-if="tenantEnabled" prop="tenantId">
<el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')" style="width: 100%">
@ -44,7 +44,7 @@
</div>
</el-form-item>
<el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">{{ proxy.$t('login.rememberPassword') }}</el-checkbox>
<el-form-item style="float: right">
<el-form-item v-if="false" style="float: right">
<el-button circle :title="proxy.$t('login.social.wechat')" @click="doSocialLogin('wechat')">
<svg-icon icon-class="wechat" />
</el-button>

Loading…
Cancel
Save