From 84f34d58b520d251b3d68aaa7e6058909c1ccff1 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 07 Jul 2022 17:48:51 +0800
Subject: [PATCH] 修改
---
src/components/remote/index.vue | 6 ++++++
src/views/home/index.vue | 29 ++++++++++++++---------------
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/components/remote/index.vue b/src/components/remote/index.vue
index b72da19..90e6af9 100644
--- a/src/components/remote/index.vue
+++ b/src/components/remote/index.vue
@@ -253,6 +253,9 @@
global.DC.ready(initViewer)
},
methods: {
+ deactivate () {
+ global.viewer.measure.deactivate()
+ },
// 根据地址获取坐标
addrToGetCoordinate (addr) {
@@ -293,6 +296,7 @@
that.$message(e)
})
},
+
setLocation () {
const longreg = /^(\-|\+)?(((\d|[1-9]\d|1[0-7]\d|0{1,3})\.\d{0,15})|(\d|[1-9]\d|1[0-7]\d|0{1,3})|180\.0{0,15}|180)$/
const latreg = /^(\-|\+)?([0-8]?\d{1}\.\d{0,15}|90\.0{0,15}|[0-8]?\d{1}|90)$/
@@ -349,9 +353,11 @@
this.$message('格式错误！')
}
},
+
closeSplitScreen () {
this.screenShow = false
},
+
splitScreen () {
this.screenShow = true
},
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 294719d..ba74b06 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2022-05-11 15:00:23
* @Last Modified by: Morpheus
- * @Last Modified time: 2022-07-01 11:15:49
+ * @Last Modified time: 2022-07-07 17:26:40
* 驾驶舱
*/
<template>
@@ -28,7 +28,7 @@
<div class="nc-num">
<div class="text">
农场数量
- <span class="num">{{ncnum}}</span>
+ <span class="num">{{ncnum}}</span>
</div>
<div class="t-l"></div>
<div class="b-l"></div>
@@ -38,7 +38,7 @@
<div class="pel-num">
<div class="text">
人员数量
- <span class="num">{{rynum}}</span>
+ <span class="num">{{rynum}}</span>
</div>
<div class="t-l"></div>
<div class="b-l"></div>
@@ -65,7 +65,7 @@
<div class="state">在使用</div>
<div class="text">
- <div class="num">{{ landsnum.toFixed(2) }}</div>
+ <div class="num">{{ landsnum.toFixed(2) }}</div>
<div class="unit">亩</div>
</div>
</div>
@@ -86,7 +86,7 @@
<div class="icon"></div>
<div class="text">
种养品种
- <div class="num">{{ num }}</div>
+ <div class="num">{{ num }}</div>
<div class="unit">种</div>
</div>
<div class="line">
@@ -96,7 +96,7 @@
</div>
<div class="content-box">
<ul>
- <li v-for="(item, index) in farmPlanList" :key="index">
+ <li v-for="(item, index) in farmPlanList" :key="index">
<div class="l">
<img :src="item.url" class="img" />
<div class="text">{{ item.strainName }}</div>
@@ -136,7 +136,7 @@
<div class="icon"></div>
<div class="text">
本年农事操作
- <div class="num">{{ total }}</div>
+ <div class="num">{{ total }}</div>
<div class="unit">次</div>
</div>
@@ -146,7 +146,7 @@
</div>
</div>
- <div class="content-box" :v-if="isFarmingDetail">
+ <div class="content-box" :v-if="isFarmingDetail">
<div class="detail" v-for="(item, index) in farmingList" :key="index">
<div class="title">{{ item.name }}</div>
<div class="num-unit">
@@ -155,7 +155,7 @@
</div>
</div>
</div>
-</div>
+ </div>
<div class="b">
<div class="title-box">
<div class="icon"></div>
@@ -176,7 +176,7 @@
<div class="b-l"></div>
<div class="b-r"></div>
<div class="title">全年销售总额（元）</div>
- <div class="price" >
+ <div class="price">
<div v-for="(item,index) in salaNum" :key="index">
<span>{{item}}</span>
</div>
@@ -189,7 +189,7 @@
</div>
</div>
- <!-- <div class="down-menu">
+ <div class="down-menu">
<div class="nc">
<span>农场</span>
<i class="el-icon-caret-bottom"></i>
@@ -202,14 +202,13 @@
<span>监测设备</span>
<i class="el-icon-caret-bottom"></i>
</div>
- </div>-->
+ </div>
<div class="city-flow" @click="cityFlowShow">
<div class="icon"></div>
<span>市场流通</span>
</div>
- <!--
<div class="layers-box">
<div class="sl">
<div class="text">标准图</div>
@@ -217,7 +216,7 @@
<div class="yx on">
<div class="text">卫星图</div>
</div>
- </div>-->
+ </div>
<div class="lenged-box">
<ul>
@@ -632,7 +631,7 @@
selctSaletZ () {
var that = this
selctSaletZ().then((res) => {
- that.salaNum = res.data.data[0].num.toString().split("")
+ that.salaNum = res.data.data[0].num.toString().split('')
})
},
getFarmingCount () {
--
Gitblit v1.9.3