feat:宁录更新

src/pages/bigdata/combine/MyMap/index.vue

@@ -274,7 +274,7 @@ export default {
               {
                 icon: {
                   img: iconUrl,
-                  size: type === 1 ? [106, 98] : [25, 30],
+                  size: type === 1 ? [106, 98] : [25, 33],
                   anchor: 'bottom-center',
                   fitZoom: 12,
                   scaleFactor: 1,
@@ -298,7 +298,7 @@ export default {
               anchor: 'top-center',
               text: item.base_name || '',
               style: this.textMarkerStyle,
-              offset: new AMap.Pixel(0, -25)
+              offset: new AMap.Pixel(0, -125)
             })
             this.map.add(text)
           }
@@ -351,23 +351,25 @@ export default {
       console.log(type, 'type--')
       const infoWindow = new AMap.InfoWindow({
         content:
-          `<div style="padding: 20px;color:#666">` +
-          `<p style="border-bottom: 2px solid #35a478;line-height: 33px;margin-bottom: 5px;">` +
+          `<div class='info-map'>` +
+          `<p class="title">` +
           type[0].type_name +
           `</p>` +
-          `<div style="display:flex;height:28px">设备ID ：` +
+          `<div class="content">` +
+          `<p style="height:28px"><span class='label'>设备ID </span>` +
           info.device_id +
-          `<p onclick="tabpo()" style="padding: 6px 13px;font-size: 12px;border-radius: 3px;background: #74ab7e;color: #fff;margin-left: 15px;">详情</p>` +
-          `</div>` +
-          `<p style="height:28px">设备名称 ：` +
+          `</p>` +
+          `<p style="height:28px"> <span class='label'>设备名称</span> ` +
           info.device_name +
           `</p>` +
-          `<p style="height:28px">设备位置 ：` +
-          info.city +
+          `<p style="height:28px"><span class='label'>设备位置</span>` +
+          (info.city || '--') +
           `</p>` +
-          `<p style="height:28px">上报时间 ：` +
+          `<p style="height:28px"><span class='label'>上报时间</span> ` +
           moment(Number(info.uptime) * 1000).format('YYYY-MM-DD HH:mm:ss') +
           `</p>` +
+          `<p onclick="tabpo()" style="cursor:pointer;width:100%;font-size: 14px;color: #0085FF;text-align:center">详情</p>` +
+          `</div>` +
           `</div>` // 使用默认信息窗体框样式，显示信息内容
       })
       infoWindow.open(this.map, [info.lng, info.lat])
@@ -650,7 +652,7 @@ export default {
                   item.device_type_id / 1 === 6
                     ? require('../assets/101.png')
                     : require('../assets/101.png'),
-                size: [25, 30],
+                size: [25, 33],
                 anchor: 'center',
                 fitZoom: 15,
                 scaleFactor: 1,
@@ -1362,23 +1364,60 @@ export default {
 ::v-deep .no-events {
   pointer-events: none !important;
 }
-::v-deep .amap-info {
-  background: #00000080;
+/deep/ .amap-info {
+  background: none;
   border-radius: 4px;
-  border: 1px solid #fff;
+
   color: #fff;
   padding: 2px 4px;
   font-size: 14px;
   margin-top: -10px;
-  .amap-info-contentContainer {
+  .amap-info-content {
+    background: rgba(0, 0, 0, 0.48);
     padding: 0;
   }
+  .amap-info-contentContainer {
+    // padding: 0;
+    background: none;
+  }
   // position: relative;
   .amap-info-close {
-    display: none;
+    // display: none;
+    color: #0085ff;
+    right: 20px;
+    top: 10px;
   }
   .amap-info-sharp {
-    display: none;
+    // display: none;
+    bottom: 2px;
+    border-top: 8px solid rgba(0, 0, 0, 0.48);
+  }
+  .info-map {
+    color: #fff;
+    .content {
+      padding: 16px 20px;
+      p {
+        height: 28px;
+        line-height: 28px;
+        margin-bottom: 2px;
+      }
+      .label {
+        display: inline-block;
+        width: 58px;
+        text-align: right;
+        color: rgba(255, 255, 255, 0.6);
+        margin-right: 8px;
+      }
+    }
+    .title {
+      color: #fff;
+      height: 35px;
+      line-height: 35px;
+      // width: 100%;
+      padding-left: 20px;
+      background-image: url('/static/images/map/map-title.png');
+      background-size: 100% 100%;
+    }
   }
   .infomainwrap {
     color: #fff;

src/pages/bigdata/combine/comp/DiseaseMonitor.vue

@@ -262,6 +262,18 @@ export default {
     background-image: url('../assets/title-bg.png');
     font-size: 18px;
     color: #ffffff;
+    /deep/ .el-input {
+      .el-input__inner {
+        border: 1px solid rgba(0, 133, 255, 0.6);
+        background: rgba(0, 133, 255, 0.3);
+        color: #fff;
+      }
+    }
+    /deep/ .el-input.is-focus .el-input__inner,
+    /deep/ .el-textarea__inner:focus,
+    /deep/ .el-input__inner:focus {
+      border-color: rgba(0, 133, 255, 0.6) !important;
+    }
   }
 }
 

src/pages/bigdata/combine/comp/Echarts/PieEcharts.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="pie_container">
     <div style="margin-top: 10%; position: relative">
-      <div ref="pie3d" style="width: 232px; height: 228px; margin-top: -15%" />
+      <div ref="pie3d" style="width: 224px; height: 220px; margin-top: -15%" />
       <div
         class="center"
         :style="{
@@ -83,7 +83,26 @@ export default {
       i: '',
       optionData: [],
       activeData: {},
-      colors: ['#00A6CA', '#00E0B0', '#FFC859', '#1671F8', '#E67B3E'],
+      colors: [
+        '#00A6CA',
+        '#00E0B0',
+        '#FFC859',
+        '#1671F8',
+        '#E67B3E',
+        '#159AFF',
+        '#FF5951',
+        '#6B53FF',
+        '#FFC97A',
+        '#6EE484',
+        '#E7EB4B',
+        '#1561F3',
+        '#FA73F5',
+        '#66EDED',
+        '#6DE28B',
+        '#A2845E',
+        '#018B3F',
+        '#00C7BE'
+      ],
       color: '#D4A23D',
       timer: null,
       option: {}

src/pages/bigdata/combine/comp/GrowPlants/index.vue

@@ -6,14 +6,13 @@
         <PieEchart v-show="leftList.length" :leftList="leftList" @changePieIndex="changePieIndex" />
         <no-data v-if="!leftList.length" />
       </div>
-      <div class="planting-record__right">
+      <div class="planting-record__right" ref="scrollContainer">
         <div
           class="record_list"
           :class="activeIndex == index ? 'active' : ''"
           v-for="(i, index) in leftList"
           :key="index"
         >
-          <!-- <div class="empty-circle" :class="'empty-circle' + index"></div> -->
           <div class="name">
             <div class="empty-circle" :style="circleStyle(index)"></div>
             {{ i.name }}：
@@ -49,7 +48,26 @@ export default {
   },
   data() {
     return {
-      colors: ['#00A6CA', '#00E0B0', '#FFC859', '#1671F8', '#E67B3E'],
+      colors: [
+        '#00A6CA',
+        '#00E0B0',
+        '#FFC859',
+        '#1671F8',
+        '#E67B3E',
+        '#159AFF',
+        '#FF5951',
+        '#6B53FF',
+        '#FFC97A',
+        '#6EE484',
+        '#E7EB4B',
+        '#1561F3',
+        '#FA73F5',
+        '#66EDED',
+        '#6DE28B',
+        '#A2845E',
+        '#018B3F',
+        '#00C7BE'
+      ],
       leftList: [
         {
           name: '农资',
@@ -83,6 +101,12 @@ export default {
     },
     changePieIndex(i) {
       this.activeIndex = i
+      const container = this.$refs.scrollContainer
+      if (container.scrollTop + container.clientHeight >= container.scrollHeight + 25) {
+        container.scrollTop = 0
+      } else {
+        container.scrollTop += 20 // 每次滚动1px
+      }
     },
     handelnumber(val) {
       return formatNumber(val)
@@ -127,13 +151,13 @@ export default {
   }
   &__content {
     // display: flex;
-    padding: 20px;
+    padding: 20px 20px 20px 5px;
     box-sizing: border-box;
     height: calc(100% - 40px);
   }
   &__left {
-    width: 228px;
-    height: 228px;
+    width: 220px;
+    height: 220px;
     // margin-right: 6px;
     float: left;
   }
@@ -143,6 +167,7 @@ export default {
     float: right;
     height: 100%;
     overflow-y: auto;
+    padding-right: 10px;
     .record_list {
       display: flex;
       align-items: center;

src/pages/bigdata/combine/comp/Monitor.vue

@@ -222,6 +222,18 @@ export default {
     background-image: url('../assets/title-bg.png');
     font-size: 18px;
     color: #ffffff;
+    /deep/ .el-input {
+      .el-input__inner {
+        border: 1px solid rgba(0, 133, 255, 0.6);
+        background: rgba(0, 133, 255, 0.3);
+        color: #fff;
+      }
+    }
+    /deep/ .el-input.is-focus .el-input__inner,
+    /deep/ .el-textarea__inner:focus,
+    /deep/ .el-input__inner:focus {
+      border-color: rgba(0, 133, 255, 0.6) !important;
+    }
   }
   .screen-container {
     padding: 4px 6px;

src/pages/bigdata/combine/comp/PestMonitoring/index.vue

@@ -209,6 +209,18 @@ export default {
     background-image: url('../../assets/title-bg.png');
     font-size: 18px;
     color: #ffffff;
+    /deep/ .el-input {
+      .el-input__inner {
+        border: 1px solid rgba(0, 133, 255, 0.6);
+        background: rgba(0, 133, 255, 0.3);
+        color: #fff;
+      }
+    }
+    /deep/ .el-input.is-focus .el-input__inner,
+    /deep/ .el-textarea__inner:focus,
+    /deep/ .el-input__inner:focus {
+      border-color: rgba(0, 133, 255, 0.6) !important;
+    }
   }
   .swiper-img {
     height: 190px;
@@ -238,58 +250,58 @@ export default {
     color: #fff;
     display: flex;
     align-items: center;
-    ::v-deep .el-date-editor {
+    /deep/ .el-date-editor {
       width: 230px;
       height: 28px;
     }
-    ::v-deep .el-range-separator {
+    /deep/ .el-range-separator {
       font-size: 14px;
       color: #fff;
     }
-    ::v-deep .el-input__inner {
-      height: 80px;
-      line-height: 80px;
-      border-radius: 8px;
-      border: 3px solid #0085ff99;
+    /deep/ .el-input__inner {
+      height: 28px;
+      line-height: 28px;
+      border-radius: 2px;
+      border: 1px solid #0085ff99;
       background: #0085ff4d;
-      font-size: 48px;
+      font-size: 12px;
       color: #fff;
-      padding-right: 20%;
+      padding-right: 1px;
     }
-    ::v-deep .el-range-input {
+    /deep/ .el-range-input {
       background: #0085ff4d;
 
       color: #fff;
     }
 
-    ::v-deep .el-date-editor {
-      font-size: 48px;
-      width: 850px;
-      height: 90px;
-      line-height: 90px;
-      padding: 0 20px;
-      border: 3px solid #1671f866;
+    /deep/ .el-date-editor {
+      font-size: 14px;
+      width: 212px;
+      height: 28px;
+      line-height: 28px;
+      padding: 0 5px;
+      border: 1px solid #1671f866;
     }
-    ::v-deep .el-input__icon {
-      font-size: 48px;
-      line-height: 90px;
+    /deep/ .el-input__icon {
+      font-size: 12px;
+      line-height: 28px;
       color: #fff;
-      padding: 0 40px;
+      padding: 0 5px;
     }
-    ::v-deep .el-range-input {
+    /deep/ .el-range-input {
       background: transparent;
-      line-height: 90px;
-      font-size: 48px;
+      line-height: 28px;
+      font-size: 12px;
       color: #fff;
-      padding-top: 5px;
+      padding-top: 2px;
       &::placeholder {
         color: #fff;
       }
     }
-    ::v-deep .el-range-separator {
-      font-size: 48px;
+    /deep/ .el-range-separator {
+      font-size: 12px;
       color: #fff;
-      line-height: 90px;
+      line-height: 28px;
     }
   }
 }

src/pages/bigdata/combine/comp/ProductIntro.vue

@@ -38,8 +38,10 @@
       <p class="pro-title">利用新技术</p>
       <div class="status-box">
         <div v-for="item in status3" :key="item.text" class="status-item">
-          <div class="status-item-bg"></div>
-          <img :src="item.img" alt="" />
+          <div class="status-item-bg">
+            <img src="../assets/circle.png" alt="" />
+          </div>
+          <img class="logo" :src="item.img" alt="" />
 
           <div class="text">
             <span>{{ item.text }}</span>
@@ -195,6 +197,18 @@ export default {
     font-size: 18px;
     color: #ffffff;
     // margin-bottom: 12px;
+    /deep/ .el-input {
+      .el-input__inner {
+        border: 1px solid rgba(0, 133, 255, 0.6);
+        background: rgba(0, 133, 255, 0.3);
+        color: #fff;
+      }
+    }
+    /deep/ .el-input.is-focus .el-input__inner,
+    /deep/ .el-textarea__inner:focus,
+    /deep/ .el-input__inner:focus {
+      border-color: rgba(0, 133, 255, 0.6) !important;
+    }
   }
   .content {
     padding: 16px 22px;
@@ -261,7 +275,7 @@ export default {
     flex-direction: column;
     align-items: center;
     margin-bottom: 10px;
-    img {
+    img.logo {
       width: 24px;
       height: 24px;
       position: absolute;
@@ -271,15 +285,19 @@ export default {
       // margin-right: 6px;
     }
     .status-item-bg {
-      width: 64px;
-      height: 64px;
-      background-image: url('../assets/circle.png');
-      background-size: 100% 100%;
+      width: 67px;
+      height: 70px;
+      // background-image: url('../assets/circle.png');
+      // background-size: 100% 100%;
       display: flex;
       align-items: center;
       justify-content: center;
       margin-bottom: 19px;
-      animation: identifierTranser 2.5s linear infinite;
+      img {
+        width: 67px;
+        height: 70px;
+        animation: identifierTranser 2.5s linear infinite;
+      }
     }
 
     .text {

src/pages/bigdata/combine/comp/Qxz.vue

@@ -173,6 +173,18 @@ export default {
     background-image: url('../assets/title-bg.png');
     font-size: 18px;
     color: #ffffff;
+    /deep/ .el-input {
+      .el-input__inner {
+        border: 1px solid rgba(0, 133, 255, 0.6);
+        background: rgba(0, 133, 255, 0.3);
+        color: #fff;
+      }
+    }
+    /deep/ .el-input.is-focus .el-input__inner,
+    /deep/ .el-textarea__inner:focus,
+    /deep/ .el-input__inner:focus {
+      border-color: rgba(0, 133, 255, 0.6) !important;
+    }
   }
   .screen-container {
     height: calc(100% - 40px);

src/pages/bigdata/combine/comp/SoilIntro.vue

@@ -255,6 +255,18 @@ export default {
     background-image: url('../assets/title-bg.png');
     font-size: 18px;
     color: #ffffff;
+    /deep/ .el-input {
+      .el-input__inner {
+        border: 1px solid rgba(0, 133, 255, 0.6);
+        background: rgba(0, 133, 255, 0.3);
+        color: #fff;
+      }
+    }
+    /deep/ .el-input.is-focus .el-input__inner,
+    /deep/ .el-textarea__inner:focus,
+    /deep/ .el-input__inner:focus {
+      border-color: rgba(0, 133, 255, 0.6) !important;
+    }
   }
 }
 

src/pages/bigdata/combine/index.vue

@@ -33,7 +33,7 @@
           </div>
         </div>
         <div class="title-user">
-          <span>河南 &#8226; 信阳 &#8226; 新县</span>
+          <!-- <span>河南 &#8226; 信阳 &#8226; 新县</span> -->
           <!-- <div class="user">{{ userName }}</div> -->
 
           <el-popover
@@ -255,6 +255,7 @@ export default {
       ]
     })
     // 初始化
+    this.getweatherinfo()
     // this.initData()
     // this.resize()
     // window.addEventListener('resize', this.resize)