src/assets/css/main.css

@@ -2248,30 +2248,6 @@
   align-items: center;
 }
 
-.vrcode-textarea {
-  width: 100%;
-  margin-bottom: 15px;
-}
-
-.vrcode-textarea .title {
-  font-size: 16px;
-  font-family: Microsoft YaHei;
-  margin-bottom: 7px;
-}
-
-.vrcode-textarea textarea {
-  width: 680px;
-  height: 160px;
-  background: rgba(90, 210, 255, 0.25);
-  border: 2px solid rgba(86, 209, 255, 0.5);
-  padding: 15px;
-  color: #fff;
-}
-
-.vrcode-textarea textarea::placeholder {
-  color: #92B1D0;
-}
-
 .vrcode-table .vrcode-btn {
   margin-bottom: 20px;
 }
@@ -2290,11 +2266,6 @@
   text-align: center;
 }
 
-.vrcode-table .vrcode-table-view.table-view :empty::before {
-  content: '--';
-  color: #fff;
-}
-
 .vrcode-table .vrcode-table-view.table-view .el-table .warning-row {
   background: rgba(0, 180, 255, 0.2);
 }
@@ -2735,7 +2706,7 @@
 
 .vrcode-model .el-dialog__body .vrcode-content .vrcode-view {
   width: 100%;
-  padding: 20px 0 15px 0;
+  padding: 30px 0 15px 0;
   border-bottom: 1px solid rgba(0, 180, 255, 0.35);
   display: flex;
   align-items: center;

src/assets/css/main.scss

@@ -2397,27 +2397,6 @@
     align-items: center;
     
 }
-.vrcode-textarea{
-    width: 100%;
-    margin-bottom: 15px;
-    .title{
-        font-size: 16px;
-font-family: Microsoft YaHei;
-margin-bottom:7px;
-    }
-    textarea{
-        width: 680px;
-height: 160px;
-background: rgba(90,210,255,0.25);
-border: 2px solid rgba(86,209,255,0.5);
-padding: 15px;
-color: #fff;
-&::placeholder{
-    
-color: #92B1D0;
-}
-    }
-}
 .vrcode-table{
     .vrcode-btn{
         margin-bottom: 20px;
@@ -2434,10 +2413,7 @@ color: #92B1D0;
                 text-align: center;
           
             }
-            :empty::before{
+    
-                content:'--';
-                color:#fff;
-            }
             .el-table .warning-row {
                 background: rgba(0, 180, 255, 0.2);
             }
@@ -2873,7 +2849,7 @@ color: #FFFFFF;
 
             .vrcode-view {
                 width: 100%;
-                padding: 20px 0 15px 0;
+                padding: 30px 0 15px 0;
                 border-bottom: 1px solid rgba(0, 180, 255, .35);
                 display: flex;
                 align-items: center;

src/views/page/largeScreen.vue

@@ -2,13 +2,13 @@
   <div class="home">
     <div class="kuang">
       <div class="title">温室智慧云数据统计</div>
-      <!-- <div class="auto_play">
+      <div class="auto_play">
         <span :class="autoPlay ? '' : 'act'" @click="autoPlay1">手动播放</span>
         <span :class="autoPlay ? 'act' : ''" @click="autoPlay2">自动播放</span>
-      </div> -->
+      </div>
-      <!-- <div class="yuan">
+      <div class="yuan">
         <img src="../../assets/img/big.png" alt="" />
-      </div> -->
+      </div>
       <div class="calendar" v-if="time">
         <img src="../../assets/img/calendar.png" alt="" />
         <span>{{ getNowTime() }}</span>
@@ -316,7 +316,7 @@ export default {
       player: null,
 
       // 自动跳转和手动跳转切换
-      //autoPlay: false, //false 手动切换   true 自动切换
+      autoPlay: false, //false 手动切换   true 自动切换
 
       typeList: [
         {
@@ -943,29 +943,29 @@ export default {
       this.dataInit(userInfo.userid);
       this.get_sel_eqbyid(userInfo.userid);
 
-      // this.autoPlay = JSON.parse(localStorage.getItem("autoPlay"));
+      this.autoPlay = JSON.parse(localStorage.getItem("autoPlay"));
-      // console.log(this.autoPlay);
+      console.log(this.autoPlay);
-      // if (this.autoPlay == false) {
+      if (this.autoPlay == false) {
-      //   clearInterval(this.timer_) && this.timer_;
+        clearInterval(this.timer_) && this.timer_;
-      // } else {
+      } else {
-      //   this.timer_ = setTimeout(() => {
+        this.timer_ = setTimeout(() => {
-      //     this.$router.push({ path: "/largeScreen1" });
+          this.$router.push({ path: "/largeScreen1" });
-      //   }, 20000);
+        }, 20000);
-      // }
+      }
     },
 
-    // autoPlay1() {
+    autoPlay1() {
-    //   this.autoPlay = false;
+      this.autoPlay = false;
-    //   clearInterval(this.timer_) && this.timer_;
+      clearInterval(this.timer_) && this.timer_;
-    //   localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
+      localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
-    // },
+    },
-    // autoPlay2() {
+    autoPlay2() {
-    //   this.autoPlay = true;
+      this.autoPlay = true;
-    //   localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
+      localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
-    //   this.timer_ = setTimeout(() => {
+      this.timer_ = setTimeout(() => {
-    //     this.$router.push({ path: "/largeScreen1" });
+        this.$router.push({ path: "/largeScreen1" });
-    //   }, 20000);
+      }, 20000);
-    // },
+    },
 
     createVideoNew(accessToken, url, index) {
       // console.log(accessToken, url, index, 111);
@@ -1309,7 +1309,7 @@ export default {
         width: 4rem;
         height: calc(100% - 0.66rem);
         box-sizing: border-box;
-        // padding-top: 0.56rem;
+        padding-top: 0.56rem;
         position: absolute;
         top: 0.56rem;
         left: 0.66rem;

src/views/page/largeScreen1.vue

@@ -6,10 +6,7 @@
       <div class="yuan" @click="toBack">
         <img src="../../assets/img/small.png" alt="" />
       </div>
-      <div class="auto_play">
+
-        <span :class="autoPlay ? '' : 'act'" @click="autoPlay1">手动播放</span>
-        <span :class="autoPlay ? 'act' : ''" @click="autoPlay2">自动播放</span>
-      </div>
       <div class="calendar">
         <img src="../../assets/img/calendar.png" alt="" />
         <span>{{ getNowTime() }}</span>
@@ -82,9 +79,17 @@
                 <template>
                   <!-- <div class="pop_content" :style="getTopOrLeft(item.greenhouseName)" :key="index"
                     v-if="popContentCurrent == index ? true : false"> -->
-                  <div class="pop_content" :style="getTopOrLeft(item.id)"
+                  <div
-                    v-show="popContentCurrent == item.id ? true : false">
+                    class="pop_content"
-                    <img class="close_img" src="../../assets/img/close.png" alt="" @click="cancelHandler" />
+                    :style="getTopOrLeft(item.id)"
+                    v-show="popContentCurrent == item.id ? true : false"
+                  >
+                    <img
+                      class="close_img"
+                      src="../../assets/img/close.png"
+                      alt=""
+                      @click="cancelHandler"
+                    />
                     <div class="p_video">
                       <img :src="item.greenhouseImage" alt="" />
                     </div>
@@ -111,12 +116,20 @@
                     </div>
                     <div class="line" style="margin-top: 0.2rem"></div>
                     <div class="icon_item scroll">
-                      <div class="icon_item_child" v-for="(item1, index1) in item.childList" :key="index1">
+                      <div
+                        class="icon_item_child"
+                        v-for="(item1, index1) in item.childList"
+                        :key="index1"
+                      >
                         <!-- <img :src="item.formula" alt=""> -->
-                        <img :src="require('../../assets/image/real-time-' +
+                        <img
+                          :src="
+                            require('../../assets/image/real-time-' +
                               item1.formula +
                               '.png')
-                          " alt="" />
+                          "
+                          alt=""
+                        />
                         <div>
                           <span>{{ item1.environmentDataId }}</span>
                           <span>{{
@@ -655,24 +668,6 @@ export default {
       }
     },
 
-    autoPlay1() {
-      let that = this
-      this.autoPlay = false;
-      clearInterval(that.timer2) && this.timer2;
-      localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
-    },
-    autoPlay2() {
-      this.autoPlay = true;
-      localStorage.setItem("autoPlay", JSON.stringify(this.autoPlay));
-      this.timer2 = setInterval(() => {
-        this.popContentCurrent++;
-        if (this.popContentCurrent > 7) {
-          this.popContentCurrent = 0;
-          // this.$router.push({ path: "/largeScreen" });
-        }
-      }, 3000);
-    },
-
     // 数据单位
     getTypeList(val) {
       let typeList1 = [];
@@ -713,7 +708,7 @@ export default {
           console.log('this.popContentCurrent',this.popContentCurrent);
           if (this.popContentCurrent > 7) {
             this.popContentCurrent = 0;
-            // this.$router.push({ path: "/largeScreen" });
+            this.$router.push({ path: "/largeScreen" });
           }
         }, 3000);
       }
@@ -855,52 +850,17 @@ export default {
       opacity: 0.89;
       text-shadow: 0.01 0.1rem 0.2rem rgba(0, 51, 103, 0.25);
 
-      background: linear-gradient(to bottom,
+      background: linear-gradient(
+        to bottom,
         #ffffff 45%,
         #e9f8ff 90%,
-          #77baff 100%);
+        #77baff 100%
+      );
       -webkit-background-clip: text;
       -webkit-text-fill-color: transparent;
       text-align: center;
     }
 
-    .auto_play {
-      height: 0.56rem;
-      position: absolute;
-      top: 0.53rem;
-      left: 1.4rem;
-      z-index: 99999999;
-      display: flex;
-      align-items: center;
-
-      >span {
-        width: 0.8rem;
-        height: 0.3rem;
-        background: rgba(14, 91, 165, 0.1);
-        border: 1px solid rgba(97, 152, 209, 0.65);
-        margin-right: 0.1rem;
-        font-size: 0.18rem;
-        font-family: MicrosoftYaHei;
-        font-weight: 400;
-        color: #70d0ee;
-        text-align: center;
-        line-height: 0.3rem;
-        cursor: pointer;
-      }
-
-      .act {
-        background: linear-gradient(-35deg,
-            #56a8d5 0%,
-            rgba(0, 55, 110, 0.75) 50%,
-            #56a8d5 100%);
-        border: 1px solid rgba(122, 225, 255, 0.75);
-        font-size: 0.18rem;
-        font-family: MicrosoftYaHei;
-        font-weight: 400;
-        color: #fff;
-      }
-    }
-
     .yuan {
       width: 0.56rem;
       height: 0.56rem;
@@ -975,21 +935,25 @@ export default {
         top: 0;
         left: 0;
         z-index: 99;
-        -webkit-mask-image: linear-gradient(90deg,
+        -webkit-mask-image: linear-gradient(
+          90deg,
           transparent 0%,
           blue 7%,
           blue 87%,
-            transparent 97%);
+          transparent 97%
+        );
 
         .map1 {
           width: 100%;
           height: 100%;
           // background: url('../assets/img/map.png') center no-repeat;
           // background-size: 100% 100%;
-          -webkit-mask-image: linear-gradient(transparent 4%,
+          -webkit-mask-image: linear-gradient(
+            transparent 4%,
             blue 15%,
             blue 86%,
-              transparent 100%);
+            transparent 100%
+          );
           overflow: hidden;
           position: absolute;
 
@@ -997,19 +961,23 @@ export default {
             width: 100%;
             height: 100%;
             position: absolute;
-            -webkit-mask-image: linear-gradient(90deg,
+            -webkit-mask-image: linear-gradient(
+              90deg,
               transparent 4%,
               blue 18%,
               blue 88%,
-                transparent 100%);
+              transparent 100%
+            );
 
             .drag_img {
               width: 100%;
               height: 100%;
-              -webkit-mask-image: linear-gradient(transparent 0%,
+              -webkit-mask-image: linear-gradient(
+                transparent 0%,
                 blue 13%,
                 blue 73%,
-                  transparent 97%);
+                transparent 97%
+              );
             }
 
             .pole_item_4 {

src/views/page/sensorSet-con.vue

@@ -166,11 +166,6 @@ export default {
 
             var num = (data - 400) / 10
             return num
-        },
-        countType4(data) {
-
-var num = (data - 1000) / 10
-return num
         },
         //反向计算提交
         sendCountType1(data) {
@@ -186,11 +181,7 @@ return num
             var num = (data * 10) + 400
             return num
         },
-        sendCountType4(data) {
 
-var num = (data* 10)+1000
-return num
-},
         //类型选择
         handleCommand(command) {
             this.typeList.forEach((el, index) => {
@@ -221,9 +212,6 @@ return num
                         } else if (el.countType == 3) {
                             this.inputData[20904 + (i * 5 + 2)] = this.countType3(this.inputData[20904 + (i * 5 + 2)])
                             this.inputData[20904 + (i * 5 + 4)] = this.countType3(this.inputData[20904 + (i * 5 + 4)])
-                        } else if (el.countType == 4) {
-                            this.inputData[20904 + (i * 5 + 2)] = this.countType4(this.inputData[20904 + (i * 5 + 2)])
-                            this.inputData[20904 + (i * 5 + 4)] = this.countType4(this.inputData[20904 + (i * 5 + 4)])
                         }
 
                     }
@@ -403,8 +391,6 @@ return num
                         number1 = this.sendCountType2(number)
                     } else if (el.countType == 3) {
                         number1 = this.sendCountType3(number)
-                    } else if (el.countType == 4) {
-                        number1 = this.sendCountType4(number)
                     }
                 }
             })

src/views/vrcode/agricultural.vue

@@ -129,9 +129,18 @@
                             </el-dropdown-menu>
                         </el-dropdown>
                     </div>
-                    <div class="vrcode-textarea">
+                    <div class="vrcode-radio">
-                        <div class="title">备注</div>
+                        <div class="radio-name">是否追溯</div>
-                        <textarea placeholder="输入您的备注信息" name="" id="" cols="30" rows="10"></textarea>
+                        <div class="radio-sel">
+                            <img v-if="modelisTrue" class="sel" src="../../assets/image/radio.png" alt="">
+                            <div v-else  @click="modelisTrue=true" class="no-sel"></div>
+                            <span>是</span>
+                        </div>
+                        <div class="radio-sel">
+                            <img v-if="!modelisTrue"  class="sel" src="../../assets/image/radio.png" alt="">
+                            <div v-else  @click="modelisTrue=false" class="no-sel"></div>
+                            <span>否</span>
+                        </div>
                     </div>
                     <div class="vrcode-selimage">
                         <div class="title">工作图片</div>
@@ -151,19 +160,6 @@
                                 @change="handleImageChange" />
                         </div>
                     </div>
-                    <div class="vrcode-radio">
-                        <div class="radio-name">是否追溯</div>
-                        <div class="radio-sel">
-                            <img v-if="modelisTrue" class="sel" src="../../assets/image/radio.png" alt="">
-                            <div v-else  @click="modelisTrue=true" class="no-sel"></div>
-                            <span>是</span>
-                        </div>
-                        <div class="radio-sel">
-                            <img v-if="!modelisTrue"  class="sel" src="../../assets/image/radio.png" alt="">
-                            <div v-else  @click="modelisTrue=false" class="no-sel"></div>
-                            <span>否</span>
-                        </div>
-                    </div>
                 </div>
             </div>
             <span slot="footer" class="dialog-footer">