Merge pull request 'pc-master' (#201) from pc-master into portal

Reviewed-on: #201

src/views/index.vue

@@ -476,7 +476,7 @@ export default {
                     // item.id == 1 丽水;
                     // item.id == 5 石门;
                     // 进入大屏的权限目前是写死的 等于几能进 反之显示没权限
-                    const foundObject = this.limitUserId.find(item => item.id == 2 || item.id == 1 || item.id == 5|| item.id == 7|| item.id == 8|| item.id == 9);
+                    const foundObject = this.limitUserId.find(item => item.id == 2 || item.id == 1 || item.id == 5|| item.id == 7|| item.id == 8|| item.id == 9|| item.id == 10);
                     if (!foundObject) {
                         this.$message('您当前没有权限查看!')
                         return

src/views/page/largeScreen.vue

@@ -181,7 +181,16 @@
                 <img class="axis_shimen8" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
                 <img class="axis_shimen9" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
               </div>
-
+                <!-- 丽水凤鸣共富葡萄 -->
+              <div class="drag_box10" ref="drag_box10" v-show="limitUserId == 10">
+                <img class="drag_img" src="../../assets/img/map6.jpg" alt="" />
+                <img class="axis_shimen" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
+                <img class="axis_shimen1" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
+                <img class="axis_shimen2" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
+                <img class="axis_shimen3" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
+                <img class="axis_shimen4" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
+                <img class="axis_shimen5" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
+              </div>
             </div>
           </div>
         </div>
@@ -354,7 +363,7 @@
               </div>
             </div>
             <!-- 大冶鑫 -->
-            <div class="content_item" v-if="limitUserId == 7|| limitUserId == 9">
+            <div class="content_item" v-if="limitUserId == 7 || limitUserId == 9|| limitUserId == 10">
               <div v-for="(item, index) in fiveControlList" :key="index" style="margin-bottom: 0.15rem">
                 <div class="i_title" v-if="item.controlState != 0">
                   <img src="../../assets/img/i_title_img.png" alt="" />
@@ -968,7 +977,7 @@ export default {
             this.get_environmentData(2023120613270120);
             this.get_readControl_getState(2023120613270120);
             this.getWeatherData(2023120613270120);
-          } else if (limitUserId == 8) {
+          } else if (limitUserId == 8||limitUserId == 10) {
             // 获取控制器第一个Id
             const list = []
             this.$store.state.equipmentList.forEach((el, index) => {
@@ -1096,12 +1105,14 @@ export default {
     get_sel_eqbyid(userId) {
       this.api.sel_eqbyid(userId).then((res) => {
         // console.log("根据用户id查询对应的设备数据 Copy", res);
+        
         res.data.data.forEach((item, index) => {
           if (
             item.cameraSerialNumber != null &&
             (item.deviceId == 2023042214250027 ||
               item.deviceId == 2023120613270115 ||
-              item.deviceId == 2024070113400048)
+              item.deviceId == 2024070113400048||
+            item.deviceId==2023042214250017)
           ) {
             this.get_sel_eqbyid_list.push({ ...item, number: index });
 
@@ -1251,7 +1262,7 @@ export default {
           // id == 1 丽水;
           // id == 5 石门;
           // id == 5 大冶鑫;
-          this.limitUserId = (res.data.data.filter(el => el.id == 2 || el.id == 1 || el.id == 5 || el.id == 7|| el.id == 8|| el.id == 9))[0].id;
+          this.limitUserId = (res.data.data.filter(el => el.id == 2 || el.id == 1 || el.id == 5 || el.id == 7 || el.id == 8 || el.id == 9|| el.id == 10))[0].id;
           if (this.limitUserId == 1) {
             this.drag_boxHandler();
             this.dataInit(userId, this.limitUserId);
@@ -1270,7 +1281,11 @@ export default {
           } else if (this.limitUserId == 9) {
             this.drag_boxHandler9();
             this.dataInit(userId, this.limitUserId);
+          }else if (this.limitUserId == 10) {
+            this.drag_boxHandler10();
+            this.dataInit(userId, this.limitUserId);
           }
+          
         }
       });
     },
@@ -1366,9 +1381,7 @@ export default {
         this.get_readControl_getState(2023042214250070);
       } else if (this.limitUserId == 7) {
         this.get_readControl_getState(2023120613270120);
-      }else if (this.limitUserId == 8) {
+      } else if (this.limitUserId == 8||this.limitUserId == 9||this.limitUserId == 10) {
-        this.get_readControl_getState(list[0].deviceId);
-      }else if (this.limitUserId == 9) {
         this.get_readControl_getState(list[0].deviceId);
       }
 
@@ -1509,6 +1522,63 @@ export default {
         }
       };
     },
+    drag_boxHandler10() {
+      let demo = this.$refs.drag_box10;
+      demo = document.querySelector(".drag_box10"); //待拖拽元素
+      let canMove = false; //拖拽状态
+      let x = 0,
+        y = 0; //鼠标位置
+      //监听按下鼠标事件
+      demo.onmousedown = function (e) {
+        x = e.pageX - demo.offsetLeft;
+        y = e.pageY - demo.offsetTop;
+        canMove = true; //激活拖拽状态
+      };
+      //监听右击鼠标事件
+      demo.oncontextmenu = function (e) {
+        e.preventDefault(); //阻止默认行为
+      };
+      //监听鼠标抬起事件
+      window.onmouseup = function () {
+        canMove = false; //关闭拖拽状态
+      };
+
+      window.onblur = function () {
+        //窗口失去焦点事件
+        canMove = false; //关闭拖拽状态
+      };
+
+      //监听鼠标移动事件
+      window.onmousemove = function (e) {
+        e.preventDefault(); //阻止默认行为(字不能拖走)
+        if (canMove) {
+          //对范围判断
+          let left = e.pageX - x;
+          let top = e.pageY - y;
+
+          demo.style.left = left + "px";
+          demo.style.top = top + "px";
+        }
+      };
+      let scale = 1;
+      demo.onwheel = function (e) {
+        if (e.wheelDelta > 0) {
+          scale += 0.05;
+          if (scale > 4) {
+            scale = 4;
+          }
+          demo.style.transform = `scale(${scale})`;
+          // console.log(scale);
+        } else {
+          scale -= 0.05;
+          if (scale < 1) {
+            scale = 1;
+          }
+          demo.style.transform = `scale(${scale})`;
+          // console.log(scale);
+        }
+      };
+    },
     drag_boxHandler9() {
       let demo = this.$refs.drag_box9;
       demo = document.querySelector(".drag_box9"); //待拖拽元素
@@ -2386,6 +2456,90 @@ export default {
                 cursor: pointer;
               }
             }
+            .drag_box10 {
+              width: 100%;
+              height: auto;
+              position: absolute;
+              // top: 0.3rem;
+              // left: 0.5rem;
+              z-index: 10;
+              top: -64px;
+              -webkit-mask-image: linear-gradient(90deg,
+                  transparent 0%,
+                  blue 2%,
+                  blue 97%,
+                  transparent 99%);
+
+              .drag_img {
+                width: 100%;
+                height: auto;
+                -webkit-mask-image: linear-gradient(transparent 0%,
+                    blue 2%,
+                    blue 95%,
+                    transparent 97%);
+              }
+
+              .axis_shimen {
+                width: 0.3rem;
+                height: auto;
+                position: absolute;
+                top: 19%;
+                left: 46%;
+                z-index: 99;
+                cursor: pointer;
+              }
+
+              .axis_shimen1 {
+                width: 0.3rem;
+                height: auto;
+                position: absolute;
+                top: 19%;
+                left: 55%;
+                z-index: 99;
+                cursor: pointer;
+              }
+
+              .axis_shimen2 {
+                width: 0.3rem;
+                height: auto;
+                position: absolute;
+                top: 48%;
+                left: 46%;
+                z-index: 99;
+                cursor: pointer;
+              }
+
+              .axis_shimen3 {
+                width: 0.3rem;
+                height: auto;
+                position: absolute;
+                top: 48%;
+    left: 56%;
+
+                z-index: 99;
+                cursor: pointer;
+              }
+
+              .axis_shimen4 {
+                width: 0.3rem;
+                height: auto;
+                position: absolute;
+                top: 73%;
+                left: 46%;
+                z-index: 99;
+                cursor: pointer;
+              }
+
+              .axis_shimen5 {
+                width: 0.3rem;
+                height: auto;
+                position: absolute;
+                top: 73%;
+                left: 57%;
+                z-index: 99;
+                cursor: pointer;
+              }
+            }
             .drag_box9 {
               width: 100%;
               height: auto;
@@ -2418,6 +2572,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen1 {
                 width: 0.3rem;
                 height: auto;
@@ -2427,6 +2582,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen2 {
                 width: 0.3rem;
                 height: auto;
@@ -2436,6 +2592,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen3 {
                 width: 0.3rem;
                 height: auto;
@@ -2445,6 +2602,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen4 {
                 width: 0.3rem;
                 height: auto;
@@ -2454,6 +2612,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen5 {
                 width: 0.3rem;
                 height: auto;
@@ -2463,6 +2622,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen6 {
                 width: 0.3rem;
                 height: auto;
@@ -2472,6 +2632,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen7 {
                 width: 0.3rem;
                 height: auto;
@@ -2481,6 +2642,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen8 {
                 width: 0.3rem;
                 height: auto;
@@ -2501,6 +2663,7 @@ export default {
                 cursor: pointer;
               }
             }
+
             .drag_box8 {
               width: 100%;
               height: auto;
@@ -2533,6 +2696,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen1 {
                 width: 0.4rem;
                 height: auto;
@@ -2542,6 +2706,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen2 {
                 width: 0.4rem;
                 height: auto;
@@ -2551,6 +2716,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen3 {
                 width: 0.4rem;
                 height: auto;
@@ -2560,6 +2726,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen4 {
                 width: 0.4rem;
                 height: auto;
@@ -2569,6 +2736,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen5 {
                 width: 0.4rem;
                 height: auto;
@@ -2578,6 +2746,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen6 {
                 width: 0.4rem;
                 height: auto;
@@ -2587,6 +2756,7 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
+
               .axis_shimen7 {
                 width: 0.4rem;
                 height: auto;
@@ -2598,6 +2768,7 @@ export default {
               }
 
             }
+
             .drag_box {
               width: 100%;
               height: 100%;
@@ -2806,7 +2977,7 @@ export default {
               }
 
               ::v-deep .swiper-slide {
-                width: 0.84rem !important;
+                width: 0.90rem !important;
               }
 
               .swiper-slide1 {}

src/views/page/largeScreen1.vue

@@ -682,6 +682,90 @@
           </div>
         </div>
       </div>
+        <!-- 甘井设施农业 -->
+        <div class="content" v-show="limitUserId == 10">
+        <div class="map">
+          <div class="map1">
+            <div class="drag_box10" ref="drag_box10">
+              <img class="drag_img" src="../../assets/img/map6.jpg" alt="" />
+              <div class="popBox" v-for="(item, index) in popContentList" :key="index">
+                <template>
+                  <div class="pole_item" :style="getTopOrLeft10(item.id)" @click="handlerPop(item.id)">
+                    <div class="p_title">
+                      <img src="../../assets/img/wenshi.png" alt="" />
+                      <span>{{item.greenhouseName}} </span>
+                    </div>
+                    <img
+                      class="pole1"
+                      src="../../assets/img/pole1.png"
+                      alt=""
+                    />
+                  </div>
+                </template>
+
+                <!-- 弹框 -->
+                <template>
+                  <div
+                    class="pop_content1"
+                    v-show="popContentCurrent == item.id ? true : false"
+                    :style="getTopOrLeft10_10(item.id)"
+                  >
+                    <img
+                      class="close_img"
+                      src="../../assets/img/close.png"
+                      alt=""
+                      @click="cancelHandler"
+                    />
+                    <div class="p_video">
+                      <img :src="item.greenhouseImage" alt="" />
+                    </div>
+                    <div class="text">{{ item.greenhouseName }}</div>
+                    <div class="line"></div>
+                    <div class="detail">
+                      <div class="d_item">
+                        <img src="../../assets/img/detail_img.png" alt="" />
+                        <span>品种：{{ item.greenhouseVariety }}</span>
+                      </div>
+                      <div class="d_item">
+                        <img src="../../assets/img/detail_img.png" alt="" />
+                        <span>数量：{{ item.greenhouseNums }}株</span>
+                      </div>
+                    </div>
+                    <div class="grow">
+                      <img src="../../assets/img/grow_img.png" alt="" />
+                      <span>生长阶段：</span>
+                      <span>{{ item.growthStageName }}</span>
+                    </div>
+                    <div class="line" style="margin-top: 0.06rem"></div>
+                    <div class="icon_item scroll">
+                      <div
+                        class="icon_item_child"
+                        v-for="(item1, index1) in item.childList"
+                        :key="index1"
+                      >
+                        <img
+                          :src="
+                            require('../../assets/image/real-time-' +
+                              item1.formula +
+                              '.png')
+                          "
+                          alt=""
+                        />
+                        <div>
+                          <span>{{ item1.environmentDataId }}</span>
+                          <span>{{
+                            item1.environmentData + getTypeList(item1.formula)
+                          }}</span>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </template>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -1327,6 +1411,36 @@ export default {
         return 'top:16.5%;left:75.5%;transform: translate(54%,0);'
       }
     },
+    getTopOrLeft10(id){
+      if(id == 1){
+        return 'top:12.5%;left:43%;z-index:10;'
+      }else if(id == 2){
+        return 'top:12.5%;left:53%;z-index:9;'
+      }else if(id == 3){
+        return 'top:45%;left:43%;z-index:8;'
+      }else if(id == 4){
+        return 'top:45%;left:54%;z-index:7;'
+      }else if(id == 5){
+        return 'top:68%;left:43%;z-index:6;'
+      }else if(id == 6){
+        return 'top:68%;left:54%;z-index:5;'
+      }
+    },
+    getTopOrLeft10_10(id){
+       if(id == 1){
+        return 'top:12.5%;left:43%;transform: translate(54%,0);'
+      }else if(id == 2){
+        return 'top:12.5%;left:53%;transform: translate(54%,0);'
+      }else if(id == 3){
+        return 'top:45%;left:43%;transform: translate(54%,0);'
+      }else if(id == 4){
+        return 'top:45%;left:54%;transform: translate(54%,0%);'
+      }else if(id == 5){
+        return 'top:68%;left:43%;transform: translate(54%,0%);'
+      }else if(id == 6){
+        return 'top:68%;left:54%;transform: translate(54%,0%);'
+      }
+    },
     getNamePosition(id) {
       if (id == 1) {
         return "position: absolute;top: 41%;left: 13%;";
@@ -1446,7 +1560,7 @@ export default {
     get_user_getjurisdiction(userId) {
       this.api.user_getjurisdiction(userId).then((res) => {
         if (res.data.code == 200) {
-          this.limitUserId = (res.data.data.filter(el=>el.id == 1 || el.id == 2 || el.id == 5|| el.id == 7|| el.id == 8|| el.id == 9))[0].id;
+          this.limitUserId = (res.data.data.filter(el=>el.id == 1 || el.id == 2 || el.id == 5|| el.id == 7|| el.id == 8|| el.id == 9|| el.id == 10))[0].id;
           if (this.limitUserId == 1) {
             this.drag_boxHandler();
           } else if (this.limitUserId == 2) {
@@ -1459,6 +1573,8 @@ export default {
             this.drag_boxHandler8();
           } else if (this.limitUserId == 9) {
             this.drag_boxHandler9();
+          } else if (this.limitUserId == 10) {
+            this.drag_boxHandler10();
           }
         }
       });
@@ -1642,6 +1758,73 @@ toHttp(){
         }
       };
     },
+    drag_boxHandler10() {
+      let demo = this.$refs.drag_box10;
+      demo = document.querySelector(".drag_box10"); //待拖拽元素
+      let canMove = false; //拖拽状态
+      let x = 0,
+        y = 0; //鼠标位置
+      //监听按下鼠标事件
+      demo.onmousedown = function (e) {
+        x = e.pageX - demo.offsetLeft;
+        y = e.pageY - demo.offsetTop;
+        canMove = true; //激活拖拽状态
+      };
+      //监听右击鼠标事件
+      demo.oncontextmenu = function (e) {
+        e.preventDefault(); //阻止默认行为
+      };
+      //监听鼠标抬起事件
+      window.onmouseup = function () {
+        canMove = false; //关闭拖拽状态
+      };
+
+      window.onblur = function () {
+        //窗口失去焦点事件
+        canMove = false; //关闭拖拽状态
+      };
+
+      //监听鼠标移动事件
+      window.onmousemove = function (e) {
+        e.preventDefault(); //阻止默认行为(字不能拖走)
+        if (canMove) {
+          //对范围判断
+          let left = e.pageX - x;
+          let top = e.pageY - y;
+
+          //if (left > 0) left = 0 //当距离左边小于0时 让它为0
+          //if (top > 0) top = 0 //当距离上边小于0时 让它为0
+          // //右边距离为 标签距离左边最大距离(页面宽度减去div宽度得到)
+          // let maxLeft = window.innerWidth - demo.offsetWidth
+          // //下边距离为 标签距离上边最大距离(页面高度减去div高度度得到)
+          // let maxTop = window.innerHeight - demo.offsetHeight
+
+          // if (left > maxLeft) left = maxLeft
+          // if (top > maxTop) top = maxTop
+
+          demo.style.left = left + "px";
+          demo.style.top = top + "px";
+        }
+      };
+      let scale = 1;
+      demo.onwheel = function (e) {
+        if (e.wheelDelta > 0) {
+          scale += 0.05;
+          if (scale > 4) {
+            scale = 4;
+          }
+          demo.style.transform = `scale(${scale})`;
+          // console.log(scale);
+        } else {
+          scale -= 0.05;
+          if (scale < 1) {
+            scale = 1;
+          }
+          demo.style.transform = `scale(${scale})`;
+          // console.log(scale);
+        }
+      };
+    },
      drag_boxHandler9() {
       let demo = this.$refs.drag_box9;
       demo = document.querySelector(".drag_box9"); //待拖拽元素
@@ -2579,7 +2762,7 @@ toHttp(){
             }
           }
           
-          .drag_box7,.drag_box8,.drag_box9{
+          .drag_box7,.drag_box8,.drag_box9,.drag_box10{
             width: 100%;
             height: auto;
             position: absolute;