taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0909

Browse Source
This commit is contained in:
dhr
2025-09-09 09:42:28 +08:00
parent 7e7d21f9ce
commit 177da7a28a
6 changed files with 255 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/largeScreen/index.ts
View File

@ -105,3 +105,11 @@ export const getSafetyDay = (projectId) => {
method: 'get'
});
};
//安全天数
export const getWeather = (projectId) => {
return request({
url: '/money/big/screen/weather/' + projectId,
method: 'get'
});
};

77
src/views/ProjectScreen/components/header.vue
View File

@ -19,8 +19,12 @@
<!-- 左侧：天气图标 + 日期文字 -->
<div class="left-section">
<div class="weather-list" @mouseenter="requestPause" @mouseleave="resumeScroll">
<div v-for="(item, i) in weatherList" :key="i" class="weather-item"
:style="{ transform: `translateY(-${offsetY}px)`, transition: transition }">
<div
v-for="(item, i) in weatherList"
:key="i"
class="weather-item"
:style="{ transform: `translateY(-${offsetY}px)`, transition: transition }"
>
<img :src="`../../../src/assets/images/${item.icon}.png`" alt="" />
<div>{{ item.weather }}{{ item.tempMin }}°/{{ item.tempMax }}°</div>
<div>{{ item.week }}({{ item.date }})</div>
@ -78,15 +82,15 @@ const props = defineProps({
type: Boolean,
default: false
}
})
});
const emit = defineEmits(['changePage'])
const emit = defineEmits(['changePage']);
const safetyDay = ref<number>(0);
const weatherList = ref<Weather[]>([])
const timer = ref<number | null>(0)
const offsetY = ref<number>(0)
const curIndex = ref(0)
const weatherList = ref<Weather[]>([]);
const timer = ref<number | null>(0);
const offsetY = ref<number>(0);
const curIndex = ref(0);
const transition = ref('transform 0.5s ease');
const pendingPause = ref(false);
@ -106,18 +110,16 @@ function judgeDayOrNight(sunRise: string, sunSet: string) {
const now = new Date();
const currentMinutes = now.getHours() * 60 + now.getMinutes();
// true 白天 false 夜晚
return currentMinutes >= sunRiseMinutes && currentMinutes <= sunSetMinutes
? true
: false;
return currentMinutes >= sunRiseMinutes && currentMinutes <= sunSetMinutes ? true : false;
}
/**
* 设置天气周期滑动
*/
const setWeatherScroll = () => {
curIndex.value += 1
curIndex.value += 1;
transition.value = 'transform 0.3s ease';
offsetY.value = curIndex.value * 60
offsetY.value = curIndex.value * 60;
if (curIndex.value === weatherList.value.length - 1) {
setTimeout(() => {
@ -126,7 +128,7 @@ const setWeatherScroll = () => {
offsetY.value = 0;
}, 350);
}
}
};
function startScroll() {
if (timer.value) clearInterval(timer.value);
@ -135,57 +137,56 @@ function startScroll() {
function requestPause() {
if (timer.value) {
clearInterval(timer.value)
timer.value = null
clearInterval(timer.value);
timer.value = null;
}
pendingPause.value = true;
}
function resumeScroll() {
console.log('resumeScroll')
console.log('resumeScroll');
pendingPause.value = false;
startScroll();
}
onMounted(() => {
/**
* 获取安全生产天数
*/
getScreenSafetyDay(props.projectId).then(res => {
const { data, code } = res
getScreenSafetyDay(props.projectId).then((res) => {
const { data, code } = res;
if (code === 200) {
safetyDay.value = data.safetyDay;
}
})
});
/**
* 获取近三天天气
*/
getScreenWeather(props.projectId).then(res => {
const { data, code } = res
getScreenWeather(props.projectId).then((res) => {
const { data, code } = res;
if (code === 200) {
data.forEach(item => {
data.forEach((item) => {
if (judgeDayOrNight(item.sunRise, item.sunSet)) {
item.weather = item.dayStatus
item.icon = item.dayIcon
item.weather = item.dayStatus;
item.icon = item.dayIcon;
} else {
item.weather = item.nightStatus
item.icon = item.nightIcon
item.weather = item.nightStatus;
item.icon = item.nightIcon;
}
})
weatherList.value = data
});
weatherList.value = data;
// 多添加第一项 实现无缝衔接
weatherList.value = [...weatherList.value, weatherList.value[0]]
startScroll()
weatherList.value = [...weatherList.value, weatherList.value[0]];
startScroll();
}
})
});
});
onUnmounted(() => {
if (timer.value) {
clearInterval(timer.value)
clearInterval(timer.value);
}
})
});
</script>
<style scoped lang="scss">
@ -228,13 +229,13 @@ onUnmounted(() => {
text-align: center;
}
.title>div:first-child {
.title > div:first-child {
/* 第一个子元素的样式 */
font-size: 38px;
letter-spacing: 0.1em;
}
.title>div:last-child {
.title > div:last-child {
/* 最后一个子元素的样式 */
font-size: 14px;
}
@ -267,7 +268,7 @@ onUnmounted(() => {
display: flex;
align-items: center;
&>div:last-child {
& > div:last-child {
margin-left: 10px;
}

244
src/views/largeScreen/components/header.vue
View File

@ -16,14 +16,20 @@
</div>
<div class="right">
<div class="top-bar">
<!-- 左侧：天气图标 + 日期文字 -->
<!-- 左侧：天气轮播区域 -->
<div class="left-section">
<img src="@/assets/large/weather.png" alt="天气图标" />
<span>
<span>多云 9°/18°</span>
<span style="padding-left: 20px"> {{ week[date.week] }} ({{ date.ymd }})</span>
</span>
<div class="weather-list" @mouseenter="requestPause" @mouseleave="resumeScroll">
<div
v-for="(item, i) in weatherList"
:key="i"
class="weather-item"
:style="{ transform: `translateY(-${offsetY}px)`, transition: transition }"
>
<img :src="`../../../src/assets/images/${item.icon}.png`" alt="" />
<div>{{ item.weather }}{{ item.tempMin }}°/{{ item.tempMax }}°</div>
<div>{{ item.week }}({{ item.date }})</div>
</div>
</div>
</div>
<!-- 分割线 -->
<div class="divider">
@ -41,29 +47,141 @@
</template>
<script setup lang="ts">
import { ref, computed, onMounted } from 'vue';
import { ref, computed, onMounted, onUnmounted } from 'vue';
import { useUserStoreHook } from '@/store/modules/user';
import { getSafetyDay } from '@/api/largeScreen/index';
import { getSafetyDay, getWeather } from '@/api/largeScreen/index';
interface WeatherData {
date: string;
week: string;
tempMax: string;
tempMin: string;
sunRise: string;
sunSet: string;
dayStatus: string;
dayIcon: string;
nightStatus: string;
nightIcon: string;
}
// 星期映射
const week = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
// 日期数据
const date = ref({
ymd: '',
hms: '',
week: 0
});
// 安全生产天数
const safetyDay = ref('');
// 用户存储
const userStore = useUserStoreHook();
const currentProject = computed(() => userStore.selectedProject);
// 天气轮播相关变量
const weatherList = ref<WeatherData[]>([]);
const offsetY = ref<number>(0);
const curIndex = ref(0);
const transition = ref('transform 0.5s ease');
const timer = ref<number | null>(0);
const pendingPause = ref(false);
// 判断当前时间是白天/夜晚
function judgeDayOrNight(sunRise: string, sunSet: string) {
const timeToMinutes = (timeStr: string) => {
const [hours, minutes] = timeStr.split(':').map(Number);
return isNaN(hours) || isNaN(minutes) ? 0 : hours * 60 + minutes;
};
const sunRiseMinutes = timeToMinutes(sunRise);
const sunSetMinutes = timeToMinutes(sunSet);
const now = new Date();
const currentMinutes = now.getHours() * 60 + now.getMinutes();
return currentMinutes >= sunRiseMinutes && currentMinutes <= sunSetMinutes;
}
// 天气轮播逻辑：每5秒切换一次
const setWeatherScroll = () => {
curIndex.value += 1;
transition.value = 'transform 0.3s ease';
offsetY.value = curIndex.value * 60; // 每个天气项高度60px，需和样式一致
// 轮播到最后一项时，无缝衔接回第一项
if (curIndex.value === weatherList.value.length - 1) {
setTimeout(() => {
transition.value = 'none';
curIndex.value = 0;
offsetY.value = 0;
}, 350);
}
};
// 启动轮播定时器
function startScroll() {
if (timer.value) clearInterval(timer.value);
timer.value = window.setInterval(setWeatherScroll, 5000) as unknown as number;
}
// 鼠标悬浮暂停轮播
function requestPause() {
if (timer.value) {
clearInterval(timer.value);
timer.value = null;
}
pendingPause.value = true;
}
// 鼠标离开恢复轮播
function resumeScroll() {
pendingPause.value = false;
startScroll();
}
// 设置实时时间
const setTime = () => {
const date1 = new Date();
const year = date1.getFullYear();
const month = date1.getMonth() + 1;
const day = date1.getDate();
const hours = date1.getHours().toString().padStart(2, '0');
const minutes = date1.getMinutes().toString().padStart(2, '0');
const seconds = date1.getSeconds().toString().padStart(2, '0');
date.value.ymd = `${year}-${month}-${day}`;
date.value.hms = `${hours}:${minutes}:${seconds}`;
date.value.week = date1.getDay();
};
// 获取天气数据
const getWeatherData = async () => {
try {
if (currentProject.value?.id) {
const res = await getWeather(currentProject.value.id);
if (res.code === 200 && res.data && res.data.length > 0) {
weatherList.value = res.data;
// 处理每一天的天气（白天/夜晚切换图标和状态）
weatherList.value.forEach((item) => {
const isDay = judgeDayOrNight(item.sunRise, item.sunSet);
item.status = isDay ? item.dayStatus : item.nightStatus;
item.icon = isDay ? item.dayIcon : item.nightIcon;
item.tempRange = `${item.tempMin}°/${item.tempMax}°`;
});
// 复制第一项实现无缝轮播
weatherList.value = [...weatherList.value, weatherList.value[0]];
startScroll(); // 数据加载后启动轮播
}
}
} catch (error) {
console.error('获取天气数据失败:', error);
}
};
// 获取安全生产天数
const getSafetyDays = async () => {
try {
console.log('currentProject', currentProject.value.id);
if (currentProject.value?.id) {
const res = await getSafetyDay(currentProject.value.id);
console.log('111111', res);
if (res.code === 200 && res.data) {
safetyDay.value = res.data.safetyDay.toString();
}
@ -73,36 +191,20 @@ const getSafetyDays = async () => {
}
};
// 组件挂载时获取数据
// 组件挂载时初始化
onMounted(() => {
setTime(); // 初始化时间
getSafetyDays();
getWeatherData();
// 时间定时器（每秒更新）
window.setInterval(setTime, 1000);
});
const setTime = () => {
let date1 = new Date();
let year: any = date1.getFullYear();
let month: any = date1.getMonth() + 1;
let day: any = date1.getDate();
let hours: any = date1.getHours();
if (hours < 10) {
hours = '0' + hours;
}
let minutes: any = date1.getMinutes();
if (minutes < 10) {
minutes = '0' + minutes;
}
let seconds: any = date1.getSeconds();
if (seconds < 10) {
seconds = '0' + seconds;
}
date.value.ymd = year + '-' + month + '-' + day;
date.value.hms = hours + ':' + minutes + ':' + seconds;
date.value.week = date1.getDay();
};
// 添加定时器，每秒更新一次时间
const timer = setInterval(setTime, 1000);
// 组件卸载时清除定时器
onUnmounted(() => {
clearInterval(timer);
if (timer.value) {
clearInterval(timer.value);
}
});
</script>
@ -116,41 +218,47 @@ onUnmounted(() => {
grid-template-columns: 1fr 1fr 1fr;
color: #fff;
}
.header_left {
display: flex;
align-items: center;
.header_left_img {
width: 48px;
height: 48px;
box-sizing: border-box;
// padding-right: 10px;
}
.header_left_text {
font-weight: 500;
text-shadow: 0px 1.24px 6.21px rgba(25, 179, 250, 1);
}
}
.header_right {
width: 100%;
height: 100%;
display: flex;
}
.title {
color: #fff;
font-family: 'AlimamaShuHeiTi', sans-serif;
text-align: center;
}
.title > div:first-child {
/* 第一个子元素的样式 */
font-size: 38px;
// font-weight: 300;
letter-spacing: 0.1em;
}
.title > div:last-child {
/* 最后一个子元素的样式 */
font-size: 14px;
letter-spacing: 0.3em; /* 调整这个值来控制间距大小 */
}
.right {
width: 100%;
height: 100%;
display: flex;
}
/* 顶部栏容器：Flex 水平布局 + 垂直居中 */
.top-bar {
width: 100%;
@ -158,27 +266,44 @@ onUnmounted(() => {
display: flex;
align-items: center;
justify-content: flex-end;
// background-color: #1e2128;
color: #fff;
padding: 8px 16px;
font-size: 14px;
}
/* 左侧区域（天气 + 日期）：自身也用 Flex 水平排列，确保元素在一行 */
.left-section {
height: 100%;
display: flex;
align-items: center;
// margin-right: auto; /* 让右侧元素（管理系统）居右 */
}
.left-section img {
width: 32px;
height: 32px;
margin-right: 8px; /* 图标与文字间距 */
.weather-list {
height: 60px;
overflow: hidden;
.weather-item {
height: 60px;
line-height: 60px;
display: flex;
align-items: center;
& > div:last-child {
margin-left: 10px;
}
img {
width: 50px;
height: 50px;
}
}
}
}
/* 分割线（视觉分隔，可根据需求调整样式） */
.divider {
display: grid;
grid-template-rows: 1fr 1fr;
height: 100%; /* 根据需要调整高度 */
gap: 2px;
padding: 14px 10px;
}
@ -195,16 +320,27 @@ onUnmounted(() => {
background: #19b5fb;
align-self: end;
}
/* 右侧区域（管理系统）：图标 + 文字水平排列 */
.right-section {
display: flex;
align-items: center;
font-family: 'AlimamaShuHeiTi', sans-serif;
font-size: 20px;
cursor: pointer;
}
.right-section img {
width: 20px;
height: 20px;
margin-right: 6px; /* 图标与文字间距 */
margin-right: 6px;
/* 图标与文字间距 */
}
.change {
display: grid;
place-items: center;
margin-right: 10px;
cursor: pointer;
}
</style>

22
src/views/materials/overallPlanMaterialSupply/indexEdit.vue
View File

@ -73,12 +73,12 @@
</el-row>
</el-form> -->
<el-table :data="tableData" v-loading="loading" row-key="id" border>
<el-table-column prop="num" label="编号" />
<el-table-column prop="name" label="名称" />
<el-table-column prop="specification" label="规格" />
<el-table-column prop="unit" label="单位" />
<el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="备注" />
<el-table-column align="center" prop="num" label="编号" />
<el-table-column align="center" prop="name" label="名称" />
<el-table-column align="center" prop="specification" label="规格" />
<el-table-column align="center" prop="unit" label="单位" />
<el-table-column align="center" prop="quantity" label="数量" />
<el-table-column align="center" prop="remark" label="备注" />
</el-table>
</div>
</el-card>
@ -214,7 +214,7 @@ const getInfo = () => {
console.log('res.data', masterDataRes);
Object.assign(form.value, masterDataRes?.data[0]);
// console.log('form', form.value);
tableData.value = res.rows.reverse();//翻转
tableData.value = res.rows; //正序显示
loading.value = false;
buttonLoading.value = false;
});
@ -319,9 +319,7 @@ onMounted(() => {
.el-input__inner,
.el-select .el-input__inner {
border-radius: 4px;
transition:
border-color 0.2s,
box-shadow 0.2s;
transition: border-color 0.2s, box-shadow 0.2s;
&:focus {
border-color: var(--primary-light);
@ -331,9 +329,7 @@ onMounted(() => {
.el-textarea__inner {
border-radius: 4px;
transition:
border-color 0.2s,
box-shadow 0.2s;
transition: border-color 0.2s, box-shadow 0.2s;
&:focus {
border-color: var(--primary-light);

4
src/views/project/landTransfer/BusinessLedger/landTransferLedger/index.vue
View File

@ -292,7 +292,7 @@
<el-form-item label="已流转面积(亩)" prop="areaValue">
<el-input v-model="sonForm.areaValue" type="number" placeholder="请输入已流转面积" @input="calcSonTransferRatio" />
<div style="color: #ff4d4f; font-size: 12px; margin-top: 4px">
{{ sonForm.areaValue && sonForm.transferStatus == '1' ? `提示：当前剩余${sonSummaryInfo.remainingArea} 亩未流转面积` : '' }}
{{ sonForm.areaValue && sonForm.transferStatus == '1' ? `提示：当前剩余${sonSummaryInfo.remainingArea} 亩` : '' }}
</div>
</el-form-item>
</el-col>
@ -325,7 +325,7 @@
<el-form-item label="不流转面积(亩)" prop="areaValue">
<el-input v-model="sonForm.areaValue" type="number" placeholder="请输入不流转面积" />
<div style="color: #ff4d4f; font-size: 12px; margin-top: 4px">
{{ sonForm.areaValue && sonForm.transferStatus == '2' ? `提示：当前剩余 ${sonSummaryInfo.remainingArea} 亩未流转面积` : '' }}
{{ sonForm.areaValue && sonForm.transferStatus == '2' ? `提示：当前剩余 ${sonSummaryInfo.remainingArea} 亩` : '' }}
</div>
</el-form-item>
</el-col>

14
src/views/system/menu/index.vue
View File

@ -46,16 +46,16 @@
:load="loadChildren"
:has-children="hasChildren"
>
<el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
<el-table-column prop="icon" label="图标" align="center" width="100">
<el-table-column align="center" prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
<el-table-column align="center" prop="icon" label="图标" width="100">
<template #default="scope">
<svg-icon :icon-class="scope.row.icon" />
</template>
</el-table-column>
<el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
<el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="status" label="状态" width="80">
<el-table-column align="center" prop="orderNum" label="排序" width="60"></el-table-column>
<el-table-column align="center" prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
<el-table-column align="center" prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
<el-table-column align="center" prop="status" label="状态" width="80">
<template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
</template>
@ -65,7 +65,7 @@
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="180">
<el-table-column align="center" fixed="right" label="操作" width="180">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button v-hasPermi="['system:menu:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)" />