xiaomeng/wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc-master #279

Merged
xiaomeng merged 2 commits from pc-master into portal 2025-09-08 03:04:03 +00:00
Conversation 0 Commits 2 Files Changed 8 +126 -21
6 changed files with 126 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9db40ecd64 - Show all commits

42
src/assets/css/main.css
View File

@ -31,6 +31,42 @@
/*滚动条边角*/
}
.flex-title {
padding-top: 0;
justify-content: space-between;
border-bottom: 1px solid transparent;
}
.flex-title > div {
display: flex;
align-items: center;
font-size: 28px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #FFFFFF;
}
.flex-title > div > img {
width: 60px;
height: 60px;
margin-right: 15px;
}
.flex-title .table-title-btn {
font-size: 16px;
}
.flex-title .table-title-btn > img {
width: 14px;
height: 14px;
margin-right: 9px;
}
.flex-title .table-right {
font-size: 20px;
font-weight: boldflex-title;
}
.amap-marker .p_title {
height: 44px;
background: rgba(1, 12, 28, 0.7);
@ -4524,12 +4560,6 @@ textarea {
margin-top: 0;
}
.videoManage .flex-title {
padding-top: 0;
justify-content: space-between;
border-bottom: 1px solid transparent;
}
.el-table .el-table__body-wrapper::-webkit-scrollbar {
/*滚动条整体*/
width: 17px;

37
src/assets/css/main.scss
View File

@ -33,6 +33,38 @@
}
}
.flex-title {
padding-top: 0;
justify-content: space-between;
border-bottom: 1px solid transparent;
>div{
display: flex;
align-items: center;
font-size: 28px;
font-family: Microsoft YaHei;
font-weight: bold;
color: #FFFFFF;
>img{
width: 60px;
height: 60px;
margin-right: 15px;
}
}
.table-title-btn{
font-size: 16px;
>img{
width: 14px;
height: 14px;
margin-right: 9px;
}
}
.table-right{
font-size: 20px;
font-weight: boldflex-title;
}
}
.amap-marker{
.p_title {
// width:50px;
@ -4798,11 +4830,6 @@ textarea {
margin-top: 0;
}
.flex-title {
padding-top: 0;
justify-content: space-between;
border-bottom: 1px solid transparent;
}
// >.flex-view {
// justify-content: space-between;

17
src/views/manage/deviceInfoManage.vue
View File

@ -1,7 +1,22 @@
<template>
<div class="deviceSet manage-page">
<div class="flex-view flex-title">
<div class="table-title">
<img src="../../assets/manageImg/deviceInfoManage.png" alt="">{{$t('deviceManagement.title')}}
<img
src="../../assets/manageImg/deviceInfoManage.png"
alt=""
/>设备信息管理
</div>
<el-tooltip placement="bottom-end">
<div slot="content">设备信息管理：<br>
1.施肥机编辑修改得名称对应得是本页面实时数据，历史数据等...得名称，<br>对应小程序实时环境名称，温室设备名称，若需要修改摄像头请联系力禾<br>工作人员。修改更多名称修改得是对应施肥机设定值参数界面得名称。<br>
2.控制器编辑界面对应得和施肥机一样，权限编辑控制当前界面内《设定<br>值参数》界面，点击可显示或隐藏对应权限。<br>
3.智能控制器同理，编辑界面修改名称，修改更多名称对应《设定值参数》<br>界面，修改名称对应得是本页得设定值参数界面和小程序得设定值参数页<br>，生态气象站和数据采集器同理，主要得功能是修改名称
</div>
<div class="table-title-btn blue">
提示
</div>
</el-tooltip>
</div>
<div class="flex-view">
<div class="manage-btn" @click="active = 0" :class="active == 0 ? 'active' : ''">

12
src/views/manage/deviceSet.vue
View File

@ -1,7 +1,17 @@
<template>
<div class="deviceStatusSet manage-page">
<div class="flex-view flex-title">
<div class="table-title">
<img src="../../assets/manageImg/deviceSet.png" alt="">{{$t('deviceStatus.title')}}
<img src="../../assets/manageImg/deviceSet.png" alt="" />设备状态设备
</div>
<el-tooltip placement="bottom-end">
<div slot="content">控制器设备设备值设置：<br>
此处编辑别名和排序对应得是当前页面下《设定值参数》界面
</div>
<div class="table-title-btn blue">
提示
</div>
</el-tooltip>
</div>
<div class="flex-view scroll">
<div class="manage-btn" v-for="item, index in topList" :key="index" @click="topChange(item, index)"

13
src/views/manage/deviceStatusSet.vue
View File

@ -1,7 +1,18 @@
<template>
<div class="deviceStatusSet manage-page">
<div class="flex-view flex-title">
<div class="table-title">
<img src="../../assets/manageImg/deviceStatusSet.png" alt="">{{$t('deviceStatus.title1')}}
<img src="../../assets/manageImg/deviceStatusSet.png" alt="">设备状态设备
</div>
<el-tooltip placement="bottom-end">
<div slot="content">控制器设备状态值设置：<br>
此处编辑名称对应：<br>
1.当前实时数据界面下控制器下方得状态值名称<br>
2.该账号下小程序内进入温室设备界面对应得各个名称</div>
<div class="table-title-btn blue">
提示
</div>
</el-tooltip>
</div>
<div class="flex-view scroll">
<div class="manage-btn" v-for="item,index in topList" :key="index" @click="topChange(item,index)" :class="active == index ? 'active' : ''">

18
src/views/manage/weatherData.vue
View File

@ -1,11 +1,23 @@
<template>
<div class="videoManage manage-page ">
<div class="flex-view flex-title">
<div class="table-title">
<img src="../../assets/manageImg/deviceManage.png" alt=""> {{ $t('deviceBinding.title') }}
<img src="../../assets/manageImg/deviceManage.png" alt="">设备绑定气象站数据
</div>
<div class="flex-view border-none padding-none">
<el-tooltip placement="bottom-end">
<div slot="content">设备绑定气象站数据：<br>
对应当前页面和小程序实时数据界面下单独将某个设备得<br>气象站拉出来，可选择该账户下得设备
</div>
<div class="table-title-btn blue">
提示
</div>
</el-tooltip>
<div class="table-title-btn blue" style="margin-left:10px" @click="openModel({}, 0)">
<img src="../../assets/manageImg/add-btn.png" alt="">添加
</div>
<div class="table-title-btn blue" @click="openModel({}, 0)">
<img src="../../assets/manageImg/add-btn.png" alt="">{{$t('text.add')}}
</div>
</div>
<div class="table-view">