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|| item.id == 10|| item.id == 11 || item.id == 12);
+                    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|| item.id == 11);
                     if (!foundObject) {
                         this.$message('您当前没有权限查看!')
                         return

src/views/page/CO2.vue

@@ -88,7 +88,7 @@
           type="text"
           placeholder="0"
         />
-        <span>分钟。</span>
+        <span>分钟</span>
       </div>
     </div>
     <div class="flex-view padding-none border-none shrink-none">
@@ -146,7 +146,7 @@
           type="text"
           placeholder="0"
         />
-        <span>klux,允许补气。</span>
+        <span>klux,允许补气</span>
       </div>
     </div>
     <div class="flex-view padding-none border-none shrink-none">
@@ -168,7 +168,7 @@
           type="text"
           placeholder="0"
         />
-        <span>℃，允许补气。</span>
+        <span>℃，允许补气</span>
       </div>
     </div>
     <div class="flex-view padding-none border-none shrink-none">
@@ -207,7 +207,7 @@
           type="text"
           placeholder="0"
         />
-        <span>秒 ，关闭</span>
+        <span>秒 ，关闭多少</span>
           <input
           @blur="blurChange(startList[indexs - 1] + 13, $event)"
           v-model="inputData[startList[indexs - 1] + 13]"
@@ -215,7 +215,7 @@
           type="text"
           placeholder="0"
         />
-        <span>秒，进行间隔补气。</span>
+        <span>秒，进行间隔补气</span>
       </div>
     </div>
   </div>

src/views/page/largeScreen.vue

@@ -181,7 +181,7 @@
                 <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" />
@@ -193,17 +193,10 @@
                 <img class="axis_shimen6" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
                 <img class="axis_shimen7" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
               </div>
-              <!-- 镇海欣丰农场 -->
+                <!-- 镇海欣丰农场 -->
-              <div class="drag_box11" ref="drag_box11" v-show="limitUserId == 11">
+                <div class="drag_box11" ref="drag_box11" v-show="limitUserId == 11">
                 <img class="drag_img" src="../../assets/img/map7.png" alt="" />
                 <img class="axis_shimen" src="../../assets/img/axis1.png" alt="" @click="handlerAxis_5" />
-              </div>
-                 <!-- 镇海欣丰农场 -->
-                 <div class="drag_box12" ref="drag_box12" v-show="limitUserId == 12">
-                <img class="drag_img" src="../../assets/img/map8.png" 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" />
               </div>
             </div>
           </div>
@@ -377,8 +370,7 @@
               </div>
             </div>
             <!-- 大冶鑫 -->
-            <div class="content_item"
+            <div class="content_item" v-if="limitUserId == 7 || limitUserId == 9|| limitUserId == 10|| limitUserId == 11">
-              v-if="limitUserId == 7 || limitUserId == 9 || limitUserId == 10 || limitUserId == 11 || limitUserId == 12">
               <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="" />
@@ -564,13 +556,13 @@ export default {
     }, 1000);
   },
   beforeDestroy() {
-    // 销毁播放器
+        // 销毁播放器
-    if (this.player) {
+        if (this.player) {
-      // this.player.dispose();
+            // this.player.dispose();
-      this.player.stop()
+            this.player.stop()
-      this.player.destroy()
+            this.player.destroy()
-      this.player = null
+            this.player = null
-    }
+        }
     clearInterval(this.timer_) && this.timer_;
   },
   methods: {
@@ -644,7 +636,7 @@ export default {
             this.get_environmentData(2023120613270120);
             this.get_readControl_getState(2023120613270120);
             this.getWeatherData(2023120613270120);
-          } else if (limitUserId == 8 || limitUserId == 10 || limitUserId == 11|| limitUserId == 12) {
+          } else if (limitUserId == 8||limitUserId == 10||limitUserId == 11) {
             // 获取控制器第一个Id
             const list = []
             this.$store.state.equipmentList.forEach((el, index) => {
@@ -772,15 +764,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||
+            item.deviceId==2023042214250017)
-              item.deviceId == 2023120613270053)
           ) {
             this.get_sel_eqbyid_list.push({ ...item, number: index });
 
@@ -879,9 +870,8 @@ export default {
 
     // 数据单位
     getTypeList(val) {
-      var store = this.$store.state;
       let typeList1 = [];
-      typeList1 = store.typeList.filter((item) => {
+      typeList1 = this.typeList.filter((item) => {
         return item.value == val;
       });
       return typeList1[0].unit;
@@ -931,7 +921,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 || el.id == 10 || el.id == 11|| el.id == 12))[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|| el.id == 11))[0].id;
           if (this.limitUserId == 1) {
             this.drag_boxHandler();
             this.dataInit(userId, this.limitUserId);
@@ -950,17 +940,14 @@ export default {
           } else if (this.limitUserId == 9) {
             this.drag_boxHandler9();
             this.dataInit(userId, this.limitUserId);
-          } else if (this.limitUserId == 10) {
+          }else if (this.limitUserId == 10) {
             this.drag_boxHandler10();
             this.dataInit(userId, this.limitUserId);
-          } else if (this.limitUserId == 11) {
+          }else if (this.limitUserId == 11) {
             this.drag_boxHandler11();
             this.dataInit(userId, this.limitUserId);
-          }else if (this.limitUserId == 12) {
-            this.drag_boxHandler12();
-            this.dataInit(userId, this.limitUserId);
           }
-
+          
         }
       });
     },
@@ -1056,7 +1043,7 @@ export default {
         this.get_readControl_getState(2023042214250070);
       } else if (this.limitUserId == 7) {
         this.get_readControl_getState(2023120613270120);
-      } else if (this.limitUserId == 8 || this.limitUserId == 9 || this.limitUserId == 10 || this.limitUserId == 11|| this.limitUserId == 12) {
+      } else if (this.limitUserId == 8||this.limitUserId == 9||this.limitUserId == 10||this.limitUserId == 11) {
         this.get_readControl_getState(list[0].deviceId);
       }
 
@@ -1197,63 +1184,6 @@ export default {
         }
       };
     },
-    drag_boxHandler12() {
-      let demo = this.$refs.drag_box12;
-      demo = document.querySelector(".drag_box12"); //待拖拽元素
-      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_boxHandler11() {
       let demo = this.$refs.drag_box11;
       demo = document.querySelector(".drag_box11"); //待拖拽元素
@@ -2245,57 +2175,6 @@ export default {
                 cursor: pointer;
               }
             }
-            .drag_box12 {
-              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: 44%;
-                left: 24%;
-                z-index: 99;
-                cursor: pointer;
-              }
-              .axis_shimen1 {
-                width: 0.3rem;
-                height: auto;
-                position: absolute;
-                top: 34%;
-                left: 48%;
-                z-index: 99;
-                cursor: pointer;
-              }
-              .axis_shimen2 {
-                width: 0.3rem;
-                height: auto;
-                position: absolute;
-                top: 44%;
-                left: 75%;
-                z-index: 99;
-                cursor: pointer;
-              }
-            }
             .drag_box11 {
               width: 100%;
               height: auto;
@@ -2329,7 +2208,6 @@ export default {
                 cursor: pointer;
               }
             }
-
             .drag_box10 {
               width: 100%;
               height: auto;
@@ -2388,7 +2266,7 @@ export default {
                 height: auto;
                 position: absolute;
                 top: 48%;
-                left: 56%;
+    left: 56%;
 
                 z-index: 99;
                 cursor: pointer;
@@ -2413,7 +2291,6 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
-
               .axis_shimen6 {
                 width: 0.3rem;
                 height: auto;
@@ -2423,7 +2300,6 @@ export default {
                 z-index: 99;
                 cursor: pointer;
               }
-
               .axis_shimen7 {
                 width: 0.3rem;
                 height: auto;
@@ -2434,7 +2310,6 @@ export default {
                 cursor: pointer;
               }
             }
-
             .drag_box9 {
               width: 100%;
               height: auto;

src/views/page/largeScreen1.vue

@@ -617,7 +617,7 @@
                   <img class="pole1" src="../../assets/img/pole1.png" alt="" />
                 </div>
               </div> -->
-
+          
               <div class="popBox" v-for="(item, index) in popContentList" :key="index">
                 <template>
                   <div class="pole_item" :style="getTopOrLeft11(item.id)" @click="handlerPop(item.id)">
@@ -676,43 +676,6 @@
           </div>
         </div>
       </div>
-      <!-- 金山吕港草莓 -->
-      <div class="content" v-show="limitUserId == 12">
-        <div class="map">
-          <div class="map1">
-            <div class="drag_box12" ref="drag_box12">
-              <img class="drag_img" src="../../assets/img/map8.png" alt="" />
-              <div class="popBox">
-                <div class="pole_item" style="top:36.5%;left:22.5%;z-index:1;">
-                  <div class="p_title">
-                    <img src="../../assets/img/wenshi.png" alt="" />
-                    <span>控制器南</span>
-                  </div>
-                  <img class="pole1" src="../../assets/img/pole1.png" alt="" />
-                </div>
-              </div>
-              <div class="popBox">
-                <div class="pole_item" style="top:26.5%;left:46.5%;z-index:1;">
-                  <div class="p_title">
-                    <img src="../../assets/img/wenshi.png" alt="" />
-                    <span>控制中心</span>
-                  </div>
-                  <img class="pole1" src="../../assets/img/pole1.png" alt="" />
-                </div>
-              </div>
-              <div class="popBox">
-                <div class="pole_item" style="top:32.5%;left:75%;z-index:1;">
-                  <div class="p_title">
-                    <img src="../../assets/img/wenshi.png" alt="" />
-                    <span>控制器北</span>
-                  </div>
-                  <img class="pole1" src="../../assets/img/pole1.png" alt="" />
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
     </div>
   </div>
 </template>
@@ -1515,7 +1478,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 || el.id == 10 || el.id == 11 || el.id == 12))[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|| el.id == 11))[0].id;
           if (this.limitUserId == 1) {
             this.drag_boxHandler();
           } else if (this.limitUserId == 2) {
@@ -1532,8 +1495,6 @@ export default {
             this.drag_boxHandler10();
           } else if (this.limitUserId == 11) {
             this.drag_boxHandler11();
-          } else if (this.limitUserId == 12) {
-            this.drag_boxHandler12();
           }
         }
       });
@@ -1717,73 +1678,6 @@ export default {
         }
       };
     },
-    drag_boxHandler12() {
-      let demo = this.$refs.drag_box12;
-      demo = document.querySelector(".drag_box12"); //待拖拽元素
-      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_boxHandler11() {
       let demo = this.$refs.drag_box11;
       demo = document.querySelector(".drag_box11"); //待拖拽元素
@@ -2843,8 +2737,7 @@ export default {
           .drag_box8,
           .drag_box9,
           .drag_box10,
-          .drag_box11,
+          .drag_box11 {
-          .drag_box12 {
             width: 100%;
             height: auto;
             position: absolute;
@@ -2856,9 +2749,7 @@ export default {
             //   blue 97%,
             //   transparent 99%
             //  );
-            &.drag_box12{
+
-              top: 13%;
-            }
             .drag_img {
               width: 100%;
               height: auto;