diff --git a/src/api/index.js b/src/api/index.js
index a2c06df9..dd6d4f1b 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -886,5 +886,8 @@ getIccid(data){
getInsectChartData(data){
return sendPostParamsRequest(`/v1/getInsectChartData`, data)
},
+ getGetDeviceRunParam(data){
+ return sendPostParamsRequest(`/v1/getGetDeviceRunParam`, data)
+ },
};
diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index f0c78455..ee617822 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -33,8 +33,6 @@
.tips-model {
padding: 10px;
- color: #ff7f00;
- color: #ff7f00;
color: #fff;
}
@@ -1259,7 +1257,6 @@ textarea {
font-family: Microsoft YaHei;
font-weight: 400;
color: #FFFFFF;
- padding: 0 8px;
}
.input-sel-time .el-input__inner {
@@ -1267,11 +1264,12 @@ textarea {
border: 2px solid rgba(0, 186, 255, 0.4);
cursor: pointer;
position: relative;
+ color: #fff;
}
.input-sel-time .el-input__inner .el-range-input {
background: transparent;
- color: #fff;
+ color: #fff !important;
}
.input-btn {
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 777f9757..4c5a8361 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -36,8 +36,7 @@
.tips-model {
padding: 10px;
- color: #ff7f00;
- color: #ff7f00;
+
color: #fff;
.tips-model-title {
@@ -1330,7 +1329,6 @@ textarea {
font-family: Microsoft YaHei;
font-weight: 400;
color: #FFFFFF;
- padding: 0 8px;
}
.el-input__inner {
@@ -1338,10 +1336,10 @@ textarea {
border: 2px solid rgba(0, 186, 255, 0.40);
cursor: pointer;
position: relative;
-
+ color: #fff;
.el-range-input {
background: transparent;
- color: #fff;
+ color: #fff!important;
}
}
}
diff --git a/src/assets/img/img-13.jpg b/src/assets/img/img-13.jpg
new file mode 100644
index 00000000..91e41e14
Binary files /dev/null and b/src/assets/img/img-13.jpg differ
diff --git a/src/assets/js/echarts.js b/src/assets/js/echarts.js
index d38d942a..28f09a3a 100644
--- a/src/assets/js/echarts.js
+++ b/src/assets/js/echarts.js
@@ -311,6 +311,151 @@ export function thisWeekTemperature_echart(id, data) {
]
};
+ option && myChart.setOption(option);
+ window.addEventListener("resize", function () {
+ myChart.resize();
+ });
+}
+
+export function pestMonitor_num(id, data) {
+ let chartDom = document.getElementById(id);
+ let myChart = echarts.init(chartDom);
+ var myColor = [
+ "#eb2100",
+ "#eb3600",
+ "#d0570e",
+ "#d0a00e",
+ "#34da62",
+ "#00e9db",
+ "#00c0e9",
+ "#0096f3",
+ "#33CCFF",
+ "#33FFCC",
+ ];
+ var header=data.header
+ var dataList=data.data.list[0]
+ // 排序header
+ var headerNames = Object.keys(header).sort().map(key => header[key]);
+ // 排序数据
+ var objValues = Object.keys(header).sort().map(key => Number(dataList[key]) || 0);
+ const maxValue = Math.max(...objValues);
+ const maxList = new Array(objValues.length).fill(maxValue);
+ const minList = new Array(objValues.length).fill(0);
+ var option = {
+ grid: {
+ left: "11%",
+ top: "3%",
+ right: "0%",
+ bottom: "3%",
+ containLabel: true,
+ },
+ xAxis: [
+ {
+ show: false,
+ },
+ ],
+ yAxis: [
+ {
+ axisTick: "none",
+ axisLine: "none",
+ offset: "27",
+ axisLabel: {
+ textStyle: {
+ color: "#ffffff",
+ fontSize: "12",
+ },
+ },
+ data:headerNames
+ },
+ {
+ axisTick: "none",
+ axisLine: "none",
+ axisLabel: {
+ textStyle: {
+ color: "#ffffff",
+ fontSize: "12",
+ },
+ },
+ data: objValues,
+ },
+ {
+ name: "",
+ nameTextStyle: {
+ color: "#ffffff",
+ fontSize: "16",
+ },
+ axisLine: {
+ lineStyle: {
+ color: "rgba(0,0,0,0)",
+ },
+ },
+ data: [],
+ },
+ ],
+ series: [
+ {
+ name: "条",
+ type: "bar",
+ yAxisIndex: 0,
+ data: objValues,
+ // label: {
+ // normal: {
+ // show: true,
+ // position: "right",
+ // textStyle: {
+ // color: "#ffffff",
+ // fontSize: "16",
+ // },
+ // },
+ // },
+ barWidth: 6,
+ itemStyle: {
+ normal: {
+ color: function (params) {
+ var num = myColor.length;
+ return myColor[params.dataIndex % num];
+ },
+ },
+ },
+ z: 2,
+ },
+ {
+ name: "白框",
+ type: "bar",
+ yAxisIndex: 1,
+ barGap: "-100%",
+ data:maxList,
+ barWidth: 12,
+ itemStyle: {
+ normal: {
+ color: "#0e2147",
+ barBorderRadius: 5,
+ },
+ },
+ z: 1,
+ },
+
+ {
+ name: "外圆",
+ type: "scatter",
+ hoverAnimation: false,
+ data: minList,
+ yAxisIndex: 2,
+ symbolSize: 14,
+ itemStyle: {
+ normal: {
+ color: function (params) {
+ var num = myColor.length;
+ return myColor[params.dataIndex % num];
+ },
+ opacity: 1,
+ },
+ },
+ z: 2,
+ },
+ ],
+ };
+
option && myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();
diff --git a/src/assets/js/mapData.js b/src/assets/js/mapData.js
new file mode 100644
index 00000000..0f97a56e
--- /dev/null
+++ b/src/assets/js/mapData.js
@@ -0,0 +1 @@
+export default {"features":[{"geometry":{"coordinates":[[121.694759,31.411309],[121.694814,31.410775],[121.695937,31.410855],[121.695883,31.411398],[121.694758,31.411311]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.695245,31.409673],[121.695312,31.409294],[121.69597,31.40934],[121.695928,31.409709],[121.695257,31.409663]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.696057,31.409703],[121.696095,31.409358],[121.696776,31.409394],[121.69675,31.409753],[121.696064,31.409704]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[[121.696013,31.410749],[121.696052,31.41026],[121.696782,31.410319],[121.696747,31.410808],[121.696013,31.410749]]],"type":"Polygon"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.694947,31.410667],[121.694989,31.410171],[121.695972,31.410251],[121.69591,31.410749],[121.694947,31.410673]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.698151,31.408888],[121.698187,31.408636],[121.700038,31.408772],[121.700008,31.409038],[121.698153,31.408888]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.698434,31.410897],[121.698487,31.410465],[121.700263,31.410594],[121.700227,31.411016],[121.698435,31.410893]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.698255,31.410282],[121.698273,31.41009],[121.698288,31.409971],[121.70049,31.410145],[121.700478,31.410303],[121.700445,31.410441],[121.698257,31.410285]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.69812,31.409843],[121.698143,31.409519],[121.700527,31.409692],[121.700479,31.410019],[121.698123,31.409847]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.698114,31.409371],[121.698147,31.409028],[121.700575,31.409207],[121.700542,31.409552],[121.698123,31.409378]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.696878,31.411439],[121.696932,31.410937],[121.697815,31.411001],[121.697767,31.411515],[121.696878,31.411447]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.695977,31.411383],[121.696023,31.410857],[121.696822,31.410916],[121.696769,31.411456],[121.695975,31.411393]],"type":"LineString"},"type":"Feature","properties":{}}],"type":"FeatureCollection"}
diff --git a/src/components/large-nav.vue b/src/components/large-nav.vue
new file mode 100644
index 00000000..6bc36b06
--- /dev/null
+++ b/src/components/large-nav.vue
@@ -0,0 +1,118 @@
+
+
+
+
+
+

+

+
基地总览
+
+
+

+

+
监控设备
+
+
+

+

+
虫情监测
+
+
+

+

+
智能施肥机
+
+
+

+

+
环境监测
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js
index 07474112..1f2d61a9 100644
--- a/src/i18n/lang/en.js
+++ b/src/i18n/lang/en.js
@@ -225,6 +225,8 @@ module.exports = {
},
realTime: {
+ due:'Due',
+ Expiration:'Expiration Date',
target: 'Target',
average: 'Avg',
title: 'Real-time Data',
@@ -351,7 +353,9 @@ module.exports = {
growthStage: "Growth Stage",
operations: "Operations",
edit: "Edit",
- delete: "Delete"
+ delete: "Delete",
+
+ role:'Role',
},
dialog: {
title: "Edit",
@@ -454,6 +458,7 @@ module.exports = {
nickname: "Nickname",
phone: "Phone Number",
changePassword: "Change Password",
+ role:'Role',
},
dialogs: {
diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js
index 8fe0e09c..dbff58f3 100644
--- a/src/i18n/lang/zh.js
+++ b/src/i18n/lang/zh.js
@@ -232,6 +232,8 @@ module.exports = {
},
// 实时页面
realTime: {
+ due:'即将到期',
+ Expiration:'到期时间',
target: '目标',
average: '平均',
title: '实时数据',
@@ -360,7 +362,8 @@ module.exports = {
growthStage: "生长阶段",
operations: "操作",
edit: "编辑",
- delete: "删除"
+ delete: "删除",
+ role:'角色',
},
dialog: {
title: "编辑",
@@ -464,6 +467,7 @@ module.exports = {
changePassword: "修改密码",
deviceCode: "设备code码",
deviceType: "设备类型",
+ role:'角色',
},
dialogs: {
diff --git a/src/router/index.js b/src/router/index.js
index ca2ce2b0..648de555 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,6 +43,18 @@ const routes = [
path: '/largeScreen1',
name: 'largeScreen1',
component: () => import('../views/page/largeScreen1.vue')
+ },{
+ path: '/largeScreen2',
+ name: 'largeScreen2',
+ component: () => import('../views/page/largeScreen2.vue')
+ },{
+ path: '/largeScreen3',
+ name: 'largeScreen3',
+ component: () => import('../views/page/largeScreen3.vue')
+ },{
+ path: '/largeScreen4',
+ name: 'largeScreen4',
+ component: () => import('../views/page/largeScreen4.vue')
},
// 虫情查看的
{
diff --git a/src/views/manage/deviceManage.vue b/src/views/manage/deviceManage.vue
index cb1cd159..988e1537 100644
--- a/src/views/manage/deviceManage.vue
+++ b/src/views/manage/deviceManage.vue
@@ -232,7 +232,6 @@ export default {
},
deviceType: "",
- deviceSel: [],
};
},
computed:{
diff --git a/src/views/manage/userInfoControl.vue b/src/views/manage/userInfoControl.vue
index 237e21cb..8b64c9fe 100644
--- a/src/views/manage/userInfoControl.vue
+++ b/src/views/manage/userInfoControl.vue
@@ -225,10 +225,7 @@ export default {
"id": ''
},
confirmPwd: '',
- typeSelList: [],
-
deviceType:'',
- deviceSel: [],
}
},
computed:{
diff --git a/src/views/page/heatFan.vue b/src/views/page/heatFan.vue
index 535865e8..5cae15f1 100644
--- a/src/views/page/heatFan.vue
+++ b/src/views/page/heatFan.vue
@@ -200,11 +200,12 @@ export default {
return {
inputData: [],
typeList1: [
- { label:this.$t('heatFan.gearOptions.gear0'), value: 0 },
- { label:this.$t('heatFan.gearOptions.gear1',{index:1}), value: 1 },
- { label:this.$t('heatFan.gearOptions.gear1',{index:2}), value: 2 },
- { label:this.$t('heatFan.gearOptions.gear1',{index:3}), value: 3 },
- { label:this.$t('heatFan.gearOptions.gear1',{index:4}), value: 4 },
+ { label:this.$t('heatFan.gear0'), value: 0 },
+ { label:this.$t('heatFan.gear1',{index:1}), value: 1 },
+ { label:this.$t('heatFan.gear1',{index:2}), value: 2 },
+ { label:this.$t('heatFan.gear1',{index:3}), value: 3 },
+ { label:this.$t('heatFan.gear1',{index:4}), value: 4 },
+ { label:this.$t('heatFan.gear1',{index:5}), value: 5 },
],
typeList2: [
{ label: this.$t('realTime.heatingMode'), value: 1 },
diff --git a/src/views/page/intrinsicParameter.vue b/src/views/page/intrinsicParameter.vue
index 09e56c12..e873e3e5 100644
--- a/src/views/page/intrinsicParameter.vue
+++ b/src/views/page/intrinsicParameter.vue
@@ -671,7 +671,7 @@ export default {
warnModel: true,
modelPassword:'',
sensorType: '',
- typeList1: [{ label: this.$t('intrinsicParameter.averageSoilHumidity', {index: 1}), value: 0 },
+ typeList1: [{ label: this.$t('intrinsicParameterSoil.averageSoilHumidity', {index: 1}), value: 0 },
{ label: this.$t('intrinsicParameterSoil.soilHumidityOptionLabel', { index: 1 }), value: 1 },
{ label: this.$t('intrinsicParameterSoil.soilHumidityOptionLabel', { index: 2 }), value: 2 },
{ label: this.$t('intrinsicParameterSoil.soilHumidityOptionLabel', { index: 3 }), value: 3 },
diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue
index 5d6ba297..4352ebc3 100644
--- a/src/views/page/largeScreen.vue
+++ b/src/views/page/largeScreen.vue
@@ -3,7 +3,7 @@
{{ other_show ? '后退' : '园区简介' }}
-
{{ limitUserId == 9 ? '甘井设施农业大数据云平台' : '温室智慧云数据统计' }}
+
{{getName()}}
-
+
-
虫情图片
-
-
-
-
-
-
-
-
{{ item.shootTime }}
-
+
项目简介
+
+

+
上海前卫柑桔有限公司成立于1992年,地处长江入海口的长兴岛上,位于青草沙水源保护区和长兴岛郊野公园内。是目前我国规模最大、集约化程度最高的柑桔生产经营企业之一。也是上海市首批通过国家认证的绿色食品,通过了HACCP国际食品安全管理体系认证,并多次在全国柑桔评比中获得金奖、银奖和“农业部优质果品”称号。公司主营业务为柑桔生产和销售,兼营场地租赁、农业旅游、衍生品开发、技术推广等业务。
虫情趋势图
@@ -386,7 +395,7 @@
风机
-
$t('text.invalid')
+
{{$t('text.invalid')}}
菜单
@@ -432,7 +441,7 @@
{{ item.name }}
-
$t('text.invalid')
+
{{$t('text.invalid')}}
位置{{ item.progress }}%
菜单
@@ -458,7 +467,7 @@
{{ item.title }}
-
$t('text.invalid')
+
{{$t('text.invalid')}}
菜单
@@ -483,7 +492,7 @@
{{ item.title }}
-
$t('text.invalid')
+
{{$t('text.invalid')}}
菜单
@@ -508,7 +517,7 @@
{{ item.title }}
-
$t('text.invalid')
+
{{$t('text.invalid')}}
菜单
@@ -541,11 +550,13 @@ import vueSeamless from "vue-seamless-scroll";
import axios from "axios";
+import mapData from "@/assets/js/mapData.js";
import { changeLanguage, getLanguage } from '@/utils/language'
import { pestLine } from "@/assets/js/charts";
+import largeNav from '@/components/large-nav.vue'
export default {
name: "largeScreen",
- components: { vueSeamless },
+ components: { vueSeamless,largeNav },
computed: {
defaultOption() {
return {
@@ -723,10 +734,21 @@ export default {
},
watch:{
'$i18n.locale'() {
- this.dataInit()
+ let userInfo = JSON.parse(localStorage.getItem("userInfo"));
+
+ this.dataInit(userInfo.userid, this.limitUserId)
}
},
methods: {
+ getName(){
+ if(this.limitUserId==9){
+ return '甘井设施农业大数据云平台'
+ }else if(this.limitUserId==13){
+ return '上海前卫柑桔大数据平台'
+ }else{
+ return '温室智慧云数据统计'
+ }
+ },
// id9的甘井设施农业大数据云平台
timeInit() {
const start = new Date()
@@ -746,7 +768,6 @@ export default {
return formattedTime
},
getData() {
- console.log(this.dateRange);
var data = {
equipmentId:'2024070113400048',
startTime: this.getdataTime(this.dateRange[0]),
@@ -798,7 +819,7 @@ export default {
// 根据用户id查询对应的设备大数据信息
dataInit(userid, limitUserId) {
this.api.Bigdata_getAllControl(userid).then((res) => {
- // console.log('根据用户id查询对应的设备大数据信息', res);
+ console.log('根据用户id查询对应的设备大数据信息', res);
this.dataList = res.data.data;
setTimeout(() => {
new Swiper(".middle_disasterWarningAnalysis", {
@@ -935,6 +956,7 @@ export default {
this.getWeatherData(list[0].deviceId);
// 长兴前卫柑桔新优品种扩繁基地 id为13 有单独的虫情接口
if(limitUserId == 13){
+ this.mapInit()
this.getImage();
this.getCharts();
}
@@ -1282,7 +1304,7 @@ export default {
this.dataInit(userId, this.limitUserId);
}else if (this.limitUserId == 13) {
// this.drag_boxHandler13();
- this.mapInit()
+
this.dataInit(userId, this.limitUserId);
}
@@ -1290,16 +1312,70 @@ export default {
});
},
mapInit(){
+ const that = this
const map = new AMap.Map("map-13", {
zoom: 18,
- center: [121.696506, 31.410799],
+ center: [121.697751,31.410188],
});
var satelliteLayer = new AMap.TileLayer.Satellite();
var roadNetLayer = new AMap.TileLayer.RoadNet();
// map.setLayers([]); // 先清空现有图层
satelliteLayer.setMap(map); // 加载卫星图层
// roadNetLayer.setMap(map); // 加载路网图层(覆盖在卫星图上)
+// map.on("click", function (e) {
+// // 获取点击的经纬度
+// const lnglat = e.lnglat; // 返回 AMap.LngLat 对象
+// console.log("点击的经纬度:", lnglat.toString()); // 输出:121.696506,31.410799
+// // 也可以直接获取经度和纬度
+// console.log("经度:", lnglat.getLng());
+// console.log("纬度:", lnglat.getLat());
+
+// // 弹出提示框(可选)
+// const infoWindow = new AMap.InfoWindow({
+// content: `位置:${lnglat.getLng()}, ${lnglat.getLat()}`,
+// offset: new AMap.Pixel(0, -30),
+// });
+// infoWindow.open(map, lnglat);
+// });
+
+
+// 添加画范围
+ var listall = mapData.features;
+ listall.forEach((el, index) => {
+ var polygon = new AMap.Polygon({
+ map: map,
+ path: el.geometry.coordinates, //设置多边形边界路径
+ strokeColor: '#ff0000', //线颜色
+ strokeOpacity: 1, //线透明度
+ strokeWeight: 2, //线宽
+ fillColor: '#ff0000', //填充色
+ fillOpacity: 0.5, //填充透明度
+ });
+ polygon.on("click", function (e) {
+ // 在点击事件处理程序中获取点击位置的经纬度坐标
+ var lng = e.lnglat.getLng(); // 获取经度
+ var lat = e.lnglat.getLat(); // 获取纬度
+
+ // 输出经纬度坐标
+ console.log("点击位置的经度:" + lng);
+ console.log("点击位置的纬度:" + lat);
+ });
+ polygon.on("mouseover", (e) => {
+ // 点击之后覆盖物的样式
+ // console.log(e,index);
+ });
+ // 鼠标移出事件
+ polygon.on("mouseout", () => {
+ // 鼠标移开覆盖物之后覆盖物的样式
+ // console.log('离开');
+ });
+
+ //将绘制的面对象添加到地图上
+ map.add(polygon);
+ });
+
+
// 添加标点
const iconUrl = require("@/assets/img/axis1.png");
const icon = new AMap.Icon({
@@ -1307,15 +1383,23 @@ mapInit(){
size: new AMap.Size(70, 86), // 原始大小,如果不是原始大小,可以根据需要进行调整或忽略
imageSize: new AMap.Size(35, 43) // 设置实际显示的大小为35x43像素
});
-
- const marker = new AMap.Marker({
- position:new AMap.LngLat(121.696506, 31.410799),
+ this.dataList.forEach((el,index)=>{
+ if(el.xaxis&&el.yaxis){
+ const marker = new AMap.Marker({
+ position:new AMap.LngLat(el.xaxis,el.yaxis),
icon: icon,
title: "上海前卫柑桔有限公司",
offset: new AMap.Pixel(-17.5, -40), //以 icon 的 [center bottom] 为原点
});
-
- map.add(marker);
+ marker.on("click", function (e) {
+
+ that.$router.push({ path: "/largeScreen1" });
+ });
+ map.add(marker);
+ }
+
+ })
+
},
// autoPlay1() {
// this.autoPlay = false;
@@ -2219,7 +2303,7 @@ window.open("http://localhost:8080/");
}
.nav {
- width: 2.5rem;
+ // width: 2.5rem;
position: absolute;
z-index: 999999;
left: 50%;
@@ -2233,7 +2317,8 @@ window.open("http://localhost:8080/");
flex-direction: column;
align-items: center;
justify-content: center;
-
+ margin: 0 .2rem;
+ cursor: pointer;
>img {
width: 1.08rem;
height: 0.91rem;
@@ -2521,6 +2606,12 @@ window.open("http://localhost:8080/");
blue 80%,
transparent 90%,
transparent 100%);
+ &.map1-13{
+ -webkit-mask-image: unset;
+ .map1{
+ width: 100%;
+ }
+ }
.map1 {
width: 90%;
@@ -2543,7 +2634,7 @@ window.open("http://localhost:8080/");
left: 50%;
transform: translate(-50%, -50%);
overflow: hidden;
-
+
.drag_box1 {
width: 100%;
height: 100%;
@@ -2743,8 +2834,8 @@ window.open("http://localhost:8080/");
z-index: 10;
-webkit-mask-image: linear-gradient(90deg,
transparent 0%,
- blue 13%,
- blue 87%,
+ blue 27%,
+ blue 73%,
transparent 100%);
.drag_img {
width: 100%;
@@ -3430,10 +3521,25 @@ window.open("http://localhost:8080/");
color: #fff;
}
}
- .right-image-list,.right-charts{
+ .right-image-list,.right-charts,.right-aboutUs{
width: 100%;
height: calc((100% - .38rem) / 2);
}
+ .right-aboutUs{
+ color:#fff;
+ line-height:28px;
+ margin-top: .2rem;
+ img{
+ width: 100%;
+ height: 1.5rem;
+ object-fit: cover
+ }
+ >div{
+ text-indent: 2em;
+ font-size: .16rem;
+ height: calc(100% - 1.7rem);
+ }
+}
.liveVideo {
width: 4rem;
height: 0.43rem;
diff --git a/src/views/page/largeScreen1.vue b/src/views/page/largeScreen1.vue
index d68424cf..340e72fa 100644
--- a/src/views/page/largeScreen1.vue
+++ b/src/views/page/largeScreen1.vue
@@ -1,7 +1,7 @@
-
{{ limitUserId == 9 ? '甘井设施农业大数据云平台' : '温室智慧云数据统计' }}
+
{{getName()}}

@@ -907,6 +907,15 @@ export default {
clearInterval(this.timer2) && this.timer2;
},
methods: {
+ getName(){
+ if(this.limitUserId==9){
+ return '甘井设施农业大数据云平台'
+ }else if(this.limitUserId==13){
+ return '上海前卫柑桔大数据平台'
+ }else{
+ return '温室智慧云数据统计'
+ }
+ },
// 根据用户id查询对应的设备大数据信息
dataInit(userid) {
this.api.Bigdata_getAllControl(userid).then((res) => {
diff --git a/src/views/page/largeScreen2.vue b/src/views/page/largeScreen2.vue
new file mode 100644
index 00000000..a7e8686d
--- /dev/null
+++ b/src/views/page/largeScreen2.vue
@@ -0,0 +1,336 @@
+
+
+
+
上海前卫柑桔大数据平台
+
+

+
{{ getNowTime() }}
+
+
{{ time.week }}
+
+
{{ time.time }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/page/largeScreen3.vue b/src/views/page/largeScreen3.vue
new file mode 100644
index 00000000..648a3ded
--- /dev/null
+++ b/src/views/page/largeScreen3.vue
@@ -0,0 +1,2729 @@
+
+
+
+
+
上海前卫柑桔大数据平台
+
+
+

+
{{ getNowTime() }}
+
+
{{ time.week }}
+
+
{{ time.time }}
+
+
+
+
+
+
虫情视频简介
+
+
+
+
+
+
+
当日虫情数量
+
+
+
+
+
+
当日无数据~
+
+
+
+
+
虫情图片
+
+
+
+
+
+
+
+
+
{{ item.shootTime }}
+
+
+
虫情设备运行状态
+
+
+
+
+ {{rightList.intervalTime?.label}}
+
+ {{rightList.intervalTime?.value}}分钟
+
+
+
+
+ {{rightList.acquisitionTime?.label}}
+
+ {{rightList.acquisitionTime?.value}}分钟
+
+
+
+
+ {{rightList.heatingTime?.label}}
+
+ {{rightList.heatingTime?.value}}分钟
+
+
+
+
+ {{rightList.heatingTempMax?.label}}
+
+ {{rightList.heatingTempMax?.value}}℃
+
+
+
+
+ {{rightList.lowTemperature?.label}}
+
+ {{rightList.lowTemperature?.value}}℃
+
+
+
+
+ {{rightList.highTemperature?.label}}
+
+ {{rightList.highTemperature?.value}}℃
+
+
+
+
+ {{rightList.delayAfterRain?.label}}
+
+ {{rightList.delayAfterRain?.value}}分钟
+
+
+
+
+ {{rightList.startTime?.label}}
+
+ {{rightList.startTime?.value}}
+
+
+
+
+ {{rightList.endTime?.label}}
+
+ {{rightList.endTime?.value}}
+
+
+
+
+ {{rightList.uploadIntervalTime?.label}}
+
+ {{rightList.uploadIntervalTime?.value}}分钟
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/page/largeScreen4.vue b/src/views/page/largeScreen4.vue
new file mode 100644
index 00000000..d2f5d9a8
--- /dev/null
+++ b/src/views/page/largeScreen4.vue
@@ -0,0 +1,1115 @@
+
+
+
+
+
+
+
{{$t('status.irrigationStatus')}}
+
+
+
+
+
+
{{$t('status.inletPump')}}
+
{{$t('status.fertilizerPump')}}
+
+
+
+
+
+
{{$t('status.fertilizerIntensity')}}
+
+
+
{{
+ item.title }}
+
{{ item.name }}
+
{{ item.number }}
+
+
+
+
+
+
{{ deviceDetail.stationName }}
+
+
+
+
{{$t('status.targetPH')}}
+
{{ countData100(inputData['6']) }}
+
+
+
{{$t('status.measuredPH')}}
+
{{ countData100(inputData['8']) }}
+
+
+
{{$t('status.measuredEC')}}
+
{{ countData100(inputData['9']) }}
+
+
+
{{$t('status.targetEC')}}
+
{{ countData100(inputData['7']) }}
+
+
+
+
{{$t('status.solenoidValveStatus')}}
+
+
+
+
{{ index + 1 }}#
+

+
+
+
+
+
+
+
+
+
+
+
{{$t('status.sensorData')}}
+
{{$t('status.value')}}
+
{{$t('status.adValue')}}
+
+
+
+
+
+
{{ item.data }}
+
{{ item.ADdata }}
+
+
+
+
+
+
+
+
{{$t('status.fertilizationSpeed')}} (L/h)
+
+
+
{{ item.name }}
+
{{ item.number }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue
index 272b3853..cb47def2 100644
--- a/src/views/page/realTime.vue
+++ b/src/views/page/realTime.vue
@@ -36,7 +36,9 @@
-
{{$t('realTime.iccid')}}:{{$store.state.equipmentList[indexs - 1].iccidcode?$store.state.equipmentList[indexs - 1].iccidcode:''}} 到期时间: {{getPackageTime()}}(即将到期)
+
{{$t('realTime.iccid')}}:{{$store.state.equipmentList[indexs - 1].iccidcode?$store.state.equipmentList[indexs - 1].iccidcode:''}}
+ {{$t('realTime.Expiration')}}:
+ {{getPackageTime()}}({{$t('realTime.due')}})
{{$t('index.weatherStation')}}:
diff --git a/src/views/page/wetFan.vue b/src/views/page/wetFan.vue
index c381d979..8f9155e9 100644
--- a/src/views/page/wetFan.vue
+++ b/src/views/page/wetFan.vue
@@ -402,12 +402,12 @@ export default {
loading:null,
pageName:'湿帘风机',
typeList1: [
- { label:this.$t('heatFan.gearOptions.gear0'), value: 0 },
- { label:this.$t('heatFan.gearOptions.gear1',{index:1}), value: 1 },
- { label:this.$t('heatFan.gearOptions.gear1',{index:2}), value: 2 },
- { label:this.$t('heatFan.gearOptions.gear1',{index:3}), value: 3 },
- { label:this.$t('heatFan.gearOptions.gear1',{index:4}), value: 4 },
- { label:this.$t('heatFan.gearOptions.gear1',{index:5}), value: 5 },
+ { label:this.$t('heatFan.gear0'), value: 0 },
+ { label:this.$t('heatFan.gear1',{index:1}), value: 1 },
+ { label:this.$t('heatFan.gear1',{index:2}), value: 2 },
+ { label:this.$t('heatFan.gear1',{index:3}), value: 3 },
+ { label:this.$t('heatFan.gear1',{index:4}), value: 4 },
+ { label:this.$t('heatFan.gear1',{index:5}), value: 5 },
],
inputDataNew: [],
}