From 1a6bd8dd08ad9fa8b0367c104d65ffa3e6ebb150 Mon Sep 17 00:00:00 2001
From: jiangzhongzhi <new5spring@126.com>
Date: Wed, 5 Jul 2023 16:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E7=AB=99=E7=9B=91=E6=B5=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/meteorological/monitor/information.js |   6 +-
 src/assets/images/pin.png                     | Bin 0 -> 1700 bytes
 .../meteorological/monitor/drought/index.vue  | 413 ++++++++++--------
 3 files changed, 241 insertions(+), 178 deletions(-)
 create mode 100644 src/assets/images/pin.png

diff --git a/src/api/meteorological/monitor/information.js b/src/api/meteorological/monitor/information.js
index 9c668d0..b8137ed 100644
--- a/src/api/meteorological/monitor/information.js
+++ b/src/api/meteorological/monitor/information.js
@@ -34,11 +34,11 @@ export function getmeteorologyEquipment(data) {
     })
 }
 
-export function meteorologicalsPeople () {
+export function meteorologicalsPeople (data) {
     return request({
         url: 'equipment/meteorologicalsPeople',
-        method: 'post',
-
+        method: 'get',
+        params:data
     })
 }
 
diff --git a/src/assets/images/pin.png b/src/assets/images/pin.png
new file mode 100644
index 0000000000000000000000000000000000000000..e34ac0d61599d99e1835432c990f55ae2cb13ea4
GIT binary patch
literal 1700
zcmV;V23z@wP)<h;3K|Lk000e1NJLTq001Tc001ut1^@s6k21Js00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZvPDw;TR9J=Om}zWORTRh1d41D%mTuF|4Aioyg+e!4
zij;yZ3bKd`7zIQS3Swg9Q^f=l%c91Zh!7Ig#6p1(MV5fF3RJ^Z5TvvnD+SwPDbR&!
zXQrK{)0uhq_@UErfX>W&Q@{_N<YeC5d*1*4?s@0l_i_<JFd~`+06?zxjXiBBi^&22
zVD`p(lqt=uv!yaDdT2c&t_@`jln6ADoaQf47L_fu|JB}ktthUi&uy#(003S+!t<L6
z005Cg-WHhc&P`4=U^^my@=(EuXgoR1>jm4LWPA0uYPV4@VLAZv<hQyZhc0p<CtHh%
zpY<7xb+whcEe$F5Yg^;p#y=zhJqS1-!c>Dx!gZq*Ttxi1kidv&EV(;R*spI_+G}_9
z3Fv-PB)<uYl*KmW<x>&yyl5~YDj>IYjrshC(Jo`vLxuVmZZ0T?E$%>GwGI(C1O+3a
zT;}RHW-46~=Q3V>Bv3sjQ>Q}Qxb-GZ7Ci$IF9rk?I!y-awc-R@-M&W(<qN0ITi+Tc
zkJI?JbH0BZ&6hS>s*4h=wR?ex9*aBM{sc>PQG&~Q>!>da-*Z7k?^<ehCtGSBPo{j$
zQnL@jH6uq5Q4S)O-2>*fH5R(ewMj%ISvW$Q1CiR1007{)dj-1gmPyv=xVj@z7X5S~
z0L=1&5mCOWe3R8u`=cbWnDk{3oBqx{ZPBSq!CbWk+N+8rX*t@ep{wm`4iRM`Vg&~P
z;55}u7aYc6L=41wOxhBNNn7H#Py5_v(ONy;er;!x(^R+0n=#-Z+j8TOq!|(s05QM)
zk(z9X&}4(-?iJCRUB>IcT$afI06Y=RYdO1e2xI;S>CIx(mIMR?0EkJ;2Yd5nNxDu`
zjg^Sfc>oZI2_UuTi3AZrOtP-|`mRBd327hjj@GJa4r2{4CUG?e$yRp=ldQ`G28@`%
zJKO6A5eYyd2I?_&#!^x7k=iUtx&WRh!32ThmD)Im=>{-HqTSY920%hkZ_{s;q{|pV
zH%nIzM}k|Bx~%QZWpL}{@}RGq*2*HuTLuvW65Ij@T-bS8)BwrvI9u}-Xw`4=o2^#;
zmXP0{jJX*H%q1{SkxF$#MRBh)HdGdap`th>O<t7*9LJUNOd!v8A+1Qg#mXMsHssoj
zko9D${=fthxTt~SzgG0ikvucGW&{kFyrFyBxX%@uOo&fk6jH{RAVAc>@ke<8Ae1Su
z60uY<Gg9iZK$E!$6uPYLjQPn-LdHT!$XEyl{SE*CFzC07%9wiCoDxJl%_Cw%Tg{=p
z=DHJWoYv-mH>EB3#e3b`BkUD0eE|Rf$Tb;If3hH8Y`Cf)5OWFuo-bH+@=He*+RT6}
zMU%0x*T*K-mD-G;tC3e|AwG4^YA+ZfUQ#_V<}k0&1lePRKDolPDEzrPW!7OtyyOJ~
z0MKRS7e*zH*83|;OH(-z6Z+(qrV77B9~qwtx~%-d9v<(fH6m6RYmXl?H<V_&?1l%P
zzqPpnS}MB>S*gnerEWyf`m(iDdaqmb-}zlA3e9j(r_9`sh!tKQ-vA=g+`h2ktETd8
zZ@BDjK?m+Jl`iw%NwkPR+mI>Zp?`M%-lV*O_Yu*X5#Bcl5e-DNy5mk+vgz+%v&D*A
znk$0``LWn1pD#|zEBL|}3c&vn!H}xmbAB+@pB@?Vh$1X*@Wd<WbN9?c#G3p20v)P6
zrT>2R9&<x!&ZB^e9XPHmbN+!jh<Ky7{(#3&L^P;;=gfT_w=a%*m{8G4xtFsS9(f%R
zZ~BV~dOk)(Ntd@x*>7nqf97F8MI~ncJ}STDHAK7}C{FB&V&cW32?uN~Ripa?rPQTg
z%3XG5HX=3#ixqtaOGLU0-{k#dGgRk>1f>~%G4H(#uOecLn0Tp&!wIFEa}L?tYR5>q
zPZ6K|+qmUrFC${B*n1>_dEnyCY)U`uFx?z0CO%xHIX7v=jaLxSBxM}QU>>;WlFtVo
zaodg028!bq>T^?8Hq1oC4yj{=1m=NLp7^x?F`=ttd~f|>5z%L-e$+Gr5pAL9hYaR{
zlOO+B^Rv6lI>EP{k5HYNw%RZq5j#WG?h}{?F8t`4*ptlVm;eC4$s*6ZxX%0nB0Br3
u-De}Bu!F1Qrw*=?pCY2L|C;CjY5xESJN??i|B6)r0000<MNUMnLSTY9zZgUS

literal 0
HcmV?d00001

diff --git a/src/views/meteorological/monitor/drought/index.vue b/src/views/meteorological/monitor/drought/index.vue
index 34f08aa..cbcb322 100644
--- a/src/views/meteorological/monitor/drought/index.vue
+++ b/src/views/meteorological/monitor/drought/index.vue
@@ -4,15 +4,7 @@
     <div class="rightWra">
       <div class="farmlandHeader">
         监测日期:&emsp;
-        <!--                <el-select-->
-        <!--                    v-model="value"-->
-        <!--                    popper-class="select_city"-->
-        <!--                    class="m-2"-->
-        <!--                    placeholder="Select"-->
-        <!--                    @change="selectTime"-->
-        <!--                >-->
-        <!--                    <el-option v-for="item in options" :key="item" :label="item" :value="item" />-->
-        <!--                </el-select>-->
+
         <el-date-picker
             popper-class="date_poper"
             class="m-2" v-model="value" @change="selectTime"
@@ -29,8 +21,8 @@
           <div class="radioDiv">
             预警范围：
             <el-radio-group @change="onclick()" v-model="radio1" class="ml-4">
-              <el-radio :label="5000" size="large">5km</el-radio>
-              <el-radio :label="10000" size="large">10km</el-radio>
+              <el-radio :label="5000" size="large" style="color:white;">5km</el-radio>
+              <el-radio :label="10000" size="large" style="color:white;">10km</el-radio>
             </el-radio-group>
           </div>
           <div class="selectDiv">
@@ -64,19 +56,28 @@
 
           <el-table
               :cell-style="{ textAlign: 'center' }"
-              :header-cell-style="{ 'text-align': 'center' }"
-              :data="SaveResultsDiv"
+              :header-cell-style="{ 'text-align': 'center','color':'white' }"
+              :data="pageData"
               style="width: 100%"
               max-height="470px"
               @selection-change="handleSelectionChange"
 
           >
             <el-table-column type="selection" width="20"/>
-            <el-table-column prop="devCode" width="80" label="站点名称"/>
+            <el-table-column prop="msName" width="80" label="站点名称"/>
             <el-table-column prop="warning" label="预警情况"/>
             <el-table-column prop="name" width="80" label="联系人"/>
             <el-table-column prop="telephone" label="联系电话"/>
           </el-table>
+          <el-pagination
+              small
+               style="display: flex;justify-content: center;margin-top: 10px;"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              :page-size="pageSize"
+              layout=" prev, pager, next"
+              :total="SaveResultsDiv.length"
+          ></el-pagination>
           <el-button
               class="but"
               type="primary"
@@ -120,14 +121,7 @@
         </el-tooltip>
       </div>
     </div>
-    <div class="tool">
-      <span><img src="@/assets/images/LAYER.png" alt=""/></span>
-      <span><img src="@/assets/images/amplify.png" alt=""/></span>
-      <span><img src="@/assets/images/reduce.png" alt=""/></span>
-      <span><img src="@/assets/images/measure.png" alt=""/></span>
-      <span><img src="@/assets/images/face.png" alt=""/></span>
-      <span><img src="@/assets/images/position.png" alt=""/></span>
-    </div>
+
     <div id="popup">
       <div>
         <div class="rowWra">
@@ -165,20 +159,22 @@
       <el-collapse-item name="1">
         <template #title>图例</template>
         <div class="mt-4">
-          <el-checkbox-group v-model="checkList" @change="change">
-            <el-checkbox
+          <div class="tuli">
+            <div
                 v-for="(value, item, key) in dic"
                 :key="key"
                 :style="{
                                 backgroundColor: value.color,
                                 border: `1px solid value.color`,
                                 width: `100%`,
+                                height: `25px`,
+                                marginTop:`5px`,
+                                textAlign: `center`
+
                             }"
-                :v-model="value.disabled"
-                :disabled="value.disabled"
-                :label="item"
-            />
-          </el-checkbox-group>
+
+            >{{ item }}</div>
+          </div>
         </div>
       </el-collapse-item>
     </el-collapse>
@@ -188,14 +184,10 @@
 </template>
 
 <script setup>
-import {ref, onMounted, inject, reactive, watch} from 'vue';
-import {ElMessage} from 'element-plus';
-import * as echarts from 'echarts';
-import TimeLine from '@/components/TimeLine/TimeLine.vue';
-import moment from 'Moment';
-import * as turf from '@turf/turf';
-import {useEcharts} from '@/hooks/useEcharts';
-import {ElLoading} from 'element-plus';
+import {ref, onMounted, reactive,} from 'vue';
+
+
+
 import ganhan1 from '@/assets/images/ganhan1.png';
 import ganhan2 from '@/assets/images/ganhan2.png';
 import ganhan3 from '@/assets/images/ganhan3.png';
@@ -203,28 +195,28 @@ import ganhan4 from '@/assets/images/ganhan4.png';
 import ganhan0 from '@/assets/images/ganhan0.png';
 import pun from '@/assets/images/personUnselected.png';
 import pse from '@/assets/images/personSelected.png';
+import pin from '@/assets/images/pin.png';
 import {
   getmeteorologicalFreeze,
   getsendSms,
   getmeteorologyEquipment, meteorologicalsPeople, meteorology, zdmc,
 } from '@/api/meteorological/monitor/information.js';
-import axios from 'axios';
-import 'echarts-gl';
-import {download} from '@/utils/request';
-import qs from 'qs';
 
-let viewer = ref(null);
+import 'echarts-gl';
+
+
+
 const value = ref()
 
-let Township = reactive({arr: [], brr: [], crr: []}); //街道
+
 let clickInfoMap = ref({name: '', value: ''});
-const formLandRef = ref([]);
+
 const flag = ref(false);
 let rightWraFlag = ref(false);
-const checkList = ref(['false']);
-const areaDiv = ref(null);
+
+
 const value1 = ref('');
-const options = ref([]);
+
 let informationData = ref([]);
 let clickInformationData = reactive({
   lat: '',
@@ -232,9 +224,7 @@ let clickInformationData = reactive({
   name: ''
 })
 let peopleData = ref([]);
-let windArr = ref([]);
-let pressureArr = ref([]);
-let typhoonTime = ref([]);
+
 const SaveResultsDiv = ref([]);
 const radio1 = ref(5000);
 const multipleSelection = ref([]);
@@ -245,41 +235,45 @@ const personIconLayer = ref([]);
 var baozi =
     'data:image/png;base64,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';
 let dic = {
-  轻度干旱: {color: 'rgba(9, 187, 222, 1)', disabled: false},
-  中度干旱: {color: 'rgba(255, 235, 59, 1)', disabled: false},
-  严重干旱: {color: 'rgba(234, 165, 93, 1)', disabled: false},
-  特大干旱: {color: 'rgba(215, 25, 28, 1)', disabled: false},
+  '无预警': {color: 'rgba(49, 235, 7, 1)', disabled: false},
+  '轻度干旱': {color: 'rgba(9, 187, 222, 1)', disabled: false},
+  '中度干旱': {color: 'rgba(255, 235, 59, 1)', disabled: false},
+  '严重干旱': {color: 'rgba(234, 165, 93, 1)', disabled: false},
+  '特大干旱': {color: 'rgba(215, 25, 28, 1)', disabled: false},
 };
-const warnValue =ref()
-function query(){
+const warnValue = ref()
+
+function query() {
   getmeteorology()
 
 
 }
-function  reset(){
+
+function reset() {
   value.value = getYesterday().toJSON().substr(0, 10);
-  radio1.value=5000
-  zdmcValue.value=''
-  warnValue.value=''
+  radio1.value = 5000
+  zdmcValue.value = ''
+  warnValue.value = ''
   getmeteorology()
 
 }
+
 const warnList = [
   {
-    label:'轻度干旱',
-    flag:1,
+    label: '轻度干旱',
+    flag: 1,
   },
   {
-    label:'中度干旱',
-    flag:2,
+    label: '中度干旱',
+    flag: 2,
   },
   {
-    label:'严重干旱',
-    flag:3,
+    label: '严重干旱',
+    flag: 3,
   },
   {
-    label:'特大干旱',
-    flag:4,
+    label: '特大干旱',
+    flag: 4,
   },
 ]
 
@@ -331,17 +325,30 @@ const rules = reactive({
   ],
   desc: [{required: true, message: 'Please input activity form', trigger: 'blur'}],
 });
-watch(
-    () => value1.value,
-    val => {
-      let startTime = moment(value1.value[0]).format('YYYY-MM-DD')
-          ? moment(value1.value[0]).format('YYYY-MM-DD ')
-          : '';
-      let endTime = moment(value1.value[1]).format('YYYY-MM-DD')
-          ? moment(value1.value[1]).format('YYYY-MM-DD')
-          : '';
-    }
-);
+//分页相关
+const currentPage=ref(1)
+const pageSize=ref(6)
+const pageData=ref([])
+function handleCurrentChange(page){
+  currentPage.value = page;
+  updatePagedData();
+}
+function updatePagedData(){
+  const start = (currentPage.value - 1) * pageSize.value;
+  const end = currentPage.value * pageSize.value;
+  pageData.value = SaveResultsDiv.value.slice(start, end);
+}
+// watch(
+//     () => value1.value,
+//     val => {
+//       let startTime = moment(value1.value[0]).format('YYYY-MM-DD')
+//           ? moment(value1.value[0]).format('YYYY-MM-DD ')
+//           : '';
+//       let endTime = moment(value1.value[1]).format('YYYY-MM-DD')
+//           ? moment(value1.value[1]).format('YYYY-MM-DD')
+//           : '';
+//     }
+// );
 
 function getIcon(val) {
   if (val === '轻度干旱') return ganhan1
@@ -408,10 +415,18 @@ const zdmcList = ref([])
 const zdmcValue = ref('')
 
 function getmeteorology() {
-  meteorology({data: value.value, alertRange: radio1.value, flag: 1,msName:zdmcValue.value,warning:warnValue.value}).then(res=>{
-    SaveResultsDiv.value=res.data
+  meteorology({
+    data: value.value,
+    alertRange: radio1.value,
+    flag: 1,
+    msName: zdmcValue.value,
+    warning: warnValue.value
+  }).then(res => {
+    SaveResultsDiv.value = res.data
+    updatePagedData()
   })
 }
+
 getmeteorology()
 
 
@@ -455,7 +470,7 @@ function initMap() {
   });
 
   //滚轮控制村级矢量
-  map.on('moveend', function (e) {
+  map.on('moveend', function () {
     var zoom = map.getView().getZoom(); //获取当前地图的缩放级别
     if (zoom >= 13) {
       layers.setVisible(true); //显示图层
@@ -470,7 +485,7 @@ function initMap() {
     var lon = coodinate[0];
     var lat = coodinate[1];
     var view = map.getView();
-    var zoom = map.getView().getZoom();
+
     view.animate({
       center: [lon, lat],
       duration: 1000,
@@ -492,7 +507,7 @@ function initMap() {
         );
       }
     });
-    map.forEachFeatureAtPixel(pixel, (feature, layer) => {
+    map.forEachFeatureAtPixel(pixel, (feature) => {
 
 
       // 获取Feature的其他属性（例如，自定义属性'id'）
@@ -512,7 +527,7 @@ function initMap() {
         infoOverlay.setPosition(feature.getGeometry().getCoordinates());
         // 设置覆盖层的内容
         infoOverlay.getElement().innerHTML = `
-      <div class="info-window" style="padding: 10px 20px 10px 20px;background: rgba(2, 31, 26, 0.6);">
+      <div class="info-window" style="padding: 10px 20px 10px 20px;background: rgba(2, 31, 26, 0.85);border: 1.5px solid rgba(23, 194, 180, 1);">
       <span  class="close-btn" style="color:white;display: flex;justify-content: end;cursor:pointer;" >X</span>
       <div style="color:white;font-size: 18px">
         <div style="margin-top: 10px"><span>名称:</span><span>${clickInformationData.name}</span></div>
@@ -540,7 +555,7 @@ function initMap() {
         infoOverlay.setPosition(feature.getGeometry().getCoordinates());
         // 设置覆盖层的内容
         infoOverlay.getElement().innerHTML = `
-      <div class="info-window" style="padding: 10px 20px 10px 20px;background: rgba(2, 31, 26, 0.6);">
+      <div class="info-window" style="padding: 10px 20px 10px 20px;background: rgba(2, 31, 26, 0.85);border: 1.5px solid rgba(23, 194, 180, 1);">
       <span  class="close-btn" style="color:white;display: flex;justify-content: end;cursor:pointer;" >X</span>
       <div style="color:white;font-size: 18px">
         <div style="margin-top: 10px"><span>姓名:</span><span>${clickInformationData.name}</span></div>
@@ -549,6 +564,38 @@ function initMap() {
       </div>
       </div>
     `;
+        //切换图片
+        feature.setStyle(new ol.style.Style({
+          image: new ol.style.Icon({
+            src: pse,
+            scale: 0.5 // 图标的缩放比例
+          })
+        }))
+        map.getLayers().forEach(function (layer) {
+          if (layer instanceof ol.layer.Vector) {
+            let fea = layer.getSource().getFeatures()[0]
+            if (fea.get('type') === '0' && fea !== feature) {
+              if(fea.get('warning')==='0'){
+                fea.setStyle(new ol.style.Style({
+                  image: new ol.style.Icon({
+                    src: pun,
+                    scale: 0.5 // 图标的缩放比例
+                  })
+                }))
+              }else if(fea.get('warning')==='1'){
+
+                fea.setStyle(new ol.style.Style({
+                  image: new ol.style.Icon({
+                    src: pin,
+                    scale: 0.5 // 图标的缩放比例
+                  })
+                }))
+              }
+
+            }
+
+          }
+        });
         // 为关闭按钮添加点击事件监听器
         const closeButton = infoOverlay.getElement().querySelector('.close-btn');
         if (closeButton) {
@@ -560,12 +607,22 @@ function initMap() {
               if (layer instanceof ol.layer.Vector) {
                 let fea = layer.getSource().getFeatures()[0]
                 if (fea.get('type') === '0') {
-                  fea.setStyle(new ol.style.Style({
-                    image: new ol.style.Icon({
-                      src: pun,
-                      scale: 0.5 // 图标的缩放比例
-                    })
-                  }))
+                  if(fea.get('warning')==='0'){
+                    fea.setStyle(new ol.style.Style({
+                      image: new ol.style.Icon({
+                        src: pun,
+                        scale: 0.5 // 图标的缩放比例
+                      })
+                    }))
+                  }else if(fea.get('warning')==='1'){
+
+                    fea.setStyle(new ol.style.Style({
+                      image: new ol.style.Icon({
+                        src: pin,
+                        scale: 0.5 // 图标的缩放比例
+                      })
+                    }))
+                  }
                 }
 
               }
@@ -575,28 +632,7 @@ function initMap() {
           });
         }
 
-        //切换图片
-        feature.setStyle(new ol.style.Style({
-          image: new ol.style.Icon({
-            src: pse,
-            scale: 0.5 // 图标的缩放比例
-          })
-        }))
 
-        map.getLayers().forEach(function (layer) {
-          if (layer instanceof ol.layer.Vector) {
-            let fea = layer.getSource().getFeatures()[0]
-            if (fea.get('type') === '0' && fea !== feature) {
-              fea.setStyle(new ol.style.Style({
-                image: new ol.style.Icon({
-                  src: pun,
-                  scale: 0.5 // 图标的缩放比例
-                })
-              }))
-            }
-
-          }
-        });
 
       }
 
@@ -683,7 +719,10 @@ const meteorologicals = () => {
         })
       });
       // 添加矢量图层到地图
-      map.addLayer(circleLayer.value[i]);
+      if(informationData.value[i].warning!=='无灾害'){
+        map.addLayer(circleLayer.value[i]);
+      }
+
 
       // 创建一个点几何对象，使用EPSG:4326投影坐标
       const iconPointGeometry = new ol.geom.Point(centerLonLat);
@@ -714,7 +753,7 @@ const meteorologicals = () => {
   })
 
 
-  meteorologicalsPeople().then(res => {
+  meteorologicalsPeople({flag:1,alertRange:radio1.value}).then(res => {
     peopleData.value = res.data
 
     for (const i in peopleData.value) {
@@ -725,8 +764,11 @@ const meteorologicals = () => {
       const iconFeature = new ol.Feature({
         geometry: iconPointGeometry,
         id: peopleData.value[i].contacts,
-        type: peopleData.value[i].flag
+        type: peopleData.value[i].flag,
+        warning:peopleData.value[i].earlyWarning
       });
+
+    if(peopleData.value[i].earlyWarning==='0'){
       // 设置Feature的样式，包括图标
       iconFeature.setStyle(new ol.style.Style({
         image: new ol.style.Icon({
@@ -734,6 +776,22 @@ const meteorologicals = () => {
           scale: 0.5 // 图标的缩放比例
         })
       }));
+
+      personIconLayer.value[i] = new ol.layer.Vector({
+        source: new ol.source.Vector({
+          features: [iconFeature]
+        })
+      });
+      map.addLayer(personIconLayer.value[i]);
+    }else if(peopleData.value[i].earlyWarning==='1'){
+      // 设置Feature的样式，包括图标
+      iconFeature.setStyle(new ol.style.Style({
+        image: new ol.style.Icon({
+          src: pin,
+          scale: 0.5 // 图标的缩放比例
+        })
+      }));
+
       personIconLayer.value[i] = new ol.layer.Vector({
         source: new ol.source.Vector({
           features: [iconFeature]
@@ -741,11 +799,13 @@ const meteorologicals = () => {
       });
       map.addLayer(personIconLayer.value[i]);
     }
+
+    }
   })
 
 
 }
-const selectTime = (val) => {
+const selectTime = () => {
   //选择时间
 
   meteorologicals()
@@ -860,14 +920,14 @@ $height: calc(100vh - 100px);
   flex-direction: column;
   align-items: center;
   background: rgba(2, 31, 26, 0.85);
-  box-shadow: inset 0px 0px 15px 6px rgba(41, 255, 255, 0.5);
+  box-shadow: inset 0 0 15px 6px rgba(41, 255, 255, 0.5);
   transition: transform 1s;
 
   .farmlandHeader {
     display: flex;
     font-size: 18px;
     font-weight: 400;
-    letter-spacing: 0px;
+    letter-spacing: 0;
     align-items: center;
     color: rgba(255, 255, 255, 1);
     margin: 20px 0;
@@ -940,8 +1000,8 @@ $height: calc(100vh - 100px);
       }
 
       .selectDiv {
-        .el-select{
-          ::v-deep .el-input__wrapper{
+        .el-select {
+          ::v-deep .el-input__wrapper {
             box-shadow: none;
             border-radius: 4px;
             background: transparent linear-gradient(
@@ -956,26 +1016,49 @@ $height: calc(100vh - 100px);
           }
         }
       }
-    .btws{
-      display: flex;
-      justify-content: space-around;
-      align-items: center;
-      margin-top: 10px;
-      margin-bottom: 10px;
-      .el-button{
-        color:white;
-        border-radius: 4px;
+
+      .btws {
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        margin-top: 10px;
+        margin-bottom: 10px;
+
+        .el-button {
+          color: white;
+          border-radius: 4px;
 
 
-        border: 1.5px solid rgba(23, 194, 180, 1);
+          border: 1.5px solid rgba(23, 194, 180, 1);
+        }
+
+        .bt1 {
+          background: linear-gradient(180deg, rgba(16, 111, 111, 1) 0%, rgba(47, 214, 214, 1) 100%);
+        }
+
+        .bt2 {
+          background: rgba(22, 94, 102, 1);
+        }
       }
-      .bt1{
-        background: linear-gradient(180deg, rgba(16, 111, 111, 1) 0%, rgba(47, 214, 214, 1) 100%);
+      .el-pagination {
+        ::v-deep .el-pager{
+         .number{
+           margin-right: 3px;
+           margin-left: 3px;
+           border-radius: 2px;
+         }
+          .is-active{
+            background: rgba(5, 179, 179, 1);
+            color:white;
+          }
+        }
+        ::v-deep .btn-next{
+          border-radius: 2px;
+        }
+        ::v-deep .btn-prev{
+          border-radius: 2px;
+        }
       }
-      .bt2{
-        background: rgba(22, 94, 102, 1);
-      }
-    }
       :deep(.el-table tr) {
         background-color: transparent;
       }
@@ -1012,9 +1095,10 @@ $height: calc(100vh - 100px);
         }
       }
 
-      .el-checkbox-group {
+      .tuli {
         display: flex;
         flex-direction: column;
+        align-items: center;
       }
 
       :deep(.ones) {
@@ -1028,8 +1112,8 @@ $height: calc(100vh - 100px);
         --el-table-border-color: null;
         font-size: 14px;
         font-weight: 400;
-        letter-spacing: 0px;
-        line-height: 0px;
+        letter-spacing: 0;
+        line-height: 0;
         color: rgba(255, 255, 255, 1);
       }
     }
@@ -1111,8 +1195,8 @@ $height: calc(100vh - 100px);
         --el-table-border-color: null;
         font-size: 14px;
         font-weight: 400;
-        letter-spacing: 0px;
-        line-height: 0px;
+        letter-spacing: 0;
+        line-height: 0;
         color: rgba(255, 255, 255, 1);
       }
     }
@@ -1122,9 +1206,7 @@ $height: calc(100vh - 100px);
 :deep(.el-input__wrapper) {
   opacity: 1;
   border-radius: 4px;
-  // background: rgba(22, 94, 102, 1);
-  // border: 1px solid rgba(4, 153, 153, 1);
-  // box-shadow: 0px 3px 9px 0px rgba(0, 0, 0, 0.25);dsawe
+
   width: 70%;
 
   .el-input__inner {
@@ -1148,9 +1230,9 @@ $height: calc(100vh - 100px);
     font-size: 14px;
   }
 
-  --el-collapse-content-bg-color {
-    background: rgba(2, 31, 26, 0.6);
-  }
+  //--el-collapse-content-bg-color {
+  //  background: rgba(2, 31, 26, 0.6);
+  //}
 
   :deep(.el-collapse-item__content) {
     background: rgba(2, 31, 26, 0.6);
@@ -1161,20 +1243,13 @@ $height: calc(100vh - 100px);
   --el-collapse-border-color: none;
   --el-collapse-content-bg-color: none;
 
-  // opacity: 1;
-  // border-radius: 4px;
-  // background: rgba(2, 31, 26, 0.6);
-  // display: flex;
-  // flex-direction: column;
-  // justify-content: flex-start;
-  // align-items: center;
-  // padding: 10px 10px 10px 10px;
+
   p {
     margin: 10px;
     font-size: 14px;
     font-weight: 400;
-    letter-spacing: 0px;
-    line-height: 0px;
+    letter-spacing: 0;
+    line-height: 0;
     color: rgba(255, 255, 255, 1);
     text-align: center;
   }
@@ -1187,8 +1262,8 @@ $height: calc(100vh - 100px);
       padding-left: 10px;
       font-size: 14px;
       font-weight: 400;
-      letter-spacing: 0px;
-      line-height: 0px;
+      letter-spacing: 0;
+      line-height: 0;
       color: rgba(255, 255, 255, 1);
       text-align: left;
     }
@@ -1200,19 +1275,7 @@ $height: calc(100vh - 100px);
 }
 
 
-.tool {
-  position: absolute;
-  right: 30%;
-  top: 8%;
-  width: 30px;
-  height: 280px;
-  opacity: 1;
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
-  align-items: flex-start;
-  display: none;
-}
+
 
 #popup {
   border-radius: 5px;
@@ -1230,7 +1293,7 @@ $height: calc(100vh - 100px);
 
     & > span:nth-child(1) {
       font-weight: 400;
-      letter-spacing: 0px;
+      letter-spacing: 0;
       color: rgba(255, 255, 255, 1);
       // margin-top: 20px;
       line-height: 24px;
@@ -1284,7 +1347,7 @@ $height: calc(100vh - 100px);
 
     & > div:nth-child(1) {
       font-weight: 400;
-      letter-spacing: 0px;
+      letter-spacing: 0;
       color: rgba(255, 255, 255, 1);
       // margin-top: 20px;
       line-height: 24px;