![]()
\ No newline at end of file
+}
+
\ No newline at end of file
diff --git a/src/views/page/sensorSet.vue b/src/views/page/sensorSet.vue
index ca42be2..a665544 100644
--- a/src/views/page/sensorSet.vue
+++ b/src/views/page/sensorSet.vue
@@ -137,6 +137,11 @@ export default {
var num = (data - 400) / 10
return num
},
+ countType4(data) {
+
+var num = (data - 1000) / 10
+return num
+},
//反向计算提交
sendCountType1(data) {
var num = data + 400
@@ -151,6 +156,11 @@ export default {
var num = (data* 10)+400
return num
},
+ sendCountType4(data) {
+
+var num = (data* 10)+1000
+return num
+},
//类型选择
handleCommand(command){
this.typeList.forEach((el,index)=>{
@@ -181,6 +191,9 @@ export default {
}else if(el.countType==3){
this.inputData[this.numberList[i] + 2]=this.countType3(this.inputData[this.numberList[i] + 2])
this.inputData[this.numberList[i] + 4]=this.countType3(this.inputData[this.numberList[i] + 4])
+ }else if(el.countType==4){
+ this.inputData[this.numberList[i] + 2]=this.countType4(this.inputData[this.numberList[i] + 2])
+ this.inputData[this.numberList[i] + 4]=this.countType4(this.inputData[this.numberList[i] + 4])
}
}
@@ -268,6 +281,8 @@ getSendData(number){
number1=this.sendCountType2(number)
}else if(el.countType==3){
number1=this.sendCountType3(number)
+ }else if(el.countType==4){
+ number1=this.sendCountType4(number)
}
}
})
diff --git a/src/views/page/skylight.vue b/src/views/page/skylight.vue
index 89a8520..ce6d9d3 100644
--- a/src/views/page/skylight.vue
+++ b/src/views/page/skylight.vue
@@ -134,6 +134,9 @@ export default {
that.getNowData();
}, 0);
},
+ '$route.query.change'(newVal, oldVal){
+ this.dataInit();
+ },
},
mounted() {
diff --git a/src/views/page/status.vue b/src/views/page/status.vue
index e60893e..c232c5c 100644
--- a/src/views/page/status.vue
+++ b/src/views/page/status.vue
@@ -321,6 +321,11 @@ export default {
var num = (data - 400) / 10
return num.toFixed(2)
},
+ countType4(data) {
+
+var num = (data - 1000) / 10
+return num.toFixed(2)
+},
getTypeData(dataCode, typeCode) {
var typeList = this.$store.state.typeList
diff --git a/src/views/vrcode.vue b/src/views/vrcode.vue
index 4b5746e..dbaaad8 100644
--- a/src/views/vrcode.vue
+++ b/src/views/vrcode.vue
@@ -55,8 +55,8 @@ export default {
activeNames: [3],
leftList: [
- { name: '种植计划', img: require('../assets/image/vrcode-icon0.png'), list: [], router: '', isRouter: true, },
- { name: '生产环节', routerList: [], img: require('../assets/image/vrcode-icon1.png'), list: [{ name: '农事管理' }, { name: '施肥记录' }, { name: '打药记录' }, { name: '采摘记录' }, { name: '清洁记录' }, { name: '病虫害管理' },] },
+ { name: '种植计划', img: require('../assets/image/vrcode-icon0.png'), list: [], router: 'plantingPlan', isRouter: true, },
+ { name: '生产环节', routerList: ['agricultural'], img: require('../assets/image/vrcode-icon1.png'), list: [{ name: '农事管理',router:'agricultural' }, { name: '施肥记录' }, { name: '打药记录' }, { name: '采摘记录' }, { name: '清洁记录' }, { name: '病虫害管理' },] },
{ name: '产品追溯', routerList: [], img: require('../assets/image/vrcode-icon2.png'), list: [{ name: '溯源批次' }, { name: '配置溯源版面' }, { name: '各种报告库' }] },
{ name: '基础信息设置', routerList: [], img: require('../assets/image/vrcode-icon3.png'), list: [{ name: '作物品种' }, { name: '种植栽培模式' }, { name: '农事作业工序' }, { name: '人员管理' }, { name: '农场信息管理' }, { name: '供应商管理' }, { name: '生产资料管理' }, { name: '农机工具管理' }, { name: '作物外观图片库' },] },],
routerNow: 'plantingPlan',
@@ -137,19 +137,13 @@ export default {
toHome() {
this.$router.push({ name: 'home' })
},
- toRouter(item) {
- if (item.router) {
- if (item.http) {
- window.location.href = item.http;
- }
- } else {
- this.$message('当前页面正在努力开发中');
- }
- },
+
toRouter1(item) {
if (item.router) {
if (item.http) {
window.location.href = item.http;
+ }else{
+ this.$router.push({ name: item.router })
}
} else {
this.$message('当前页面正在努力开发中');
diff --git a/src/views/vrcode/agricultural.vue b/src/views/vrcode/agricultural.vue
new file mode 100644
index 0000000..e1490d4
--- /dev/null
+++ b/src/views/vrcode/agricultural.vue
@@ -0,0 +1,244 @@
+
+
+
+
+
+ 农事管理
+
+
+
+
填报
+
+
+
统计
+
+
+
+
+
+
新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.data5 ? '已公开' : '未公开' }}
+
+
+
+
+
+
+
+
+ 新增农事信息
+
+
+
+
+
+
+
+
+
+
+
是否追溯
+
+
+
+
是
+
+
+
+
+
否
+
+
+
+
工作图片
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/vrcode/plantingPlan.vue b/src/views/vrcode/plantingPlan.vue
index f0b43d5..b2033e3 100644
--- a/src/views/vrcode/plantingPlan.vue
+++ b/src/views/vrcode/plantingPlan.vue
@@ -6,23 +6,246 @@
种植计划
+ 
+ 
查看
删除