diff --git a/src/assets/image/background.jpg b/src/assets/image/background.jpg index 32a29be3..18e2bd17 100644 Binary files a/src/assets/image/background.jpg and b/src/assets/image/background.jpg differ diff --git a/src/assets/image/background.png b/src/assets/image/background.png index 7d2cb23e..083675ac 100644 Binary files a/src/assets/image/background.png and b/src/assets/image/background.png differ diff --git a/src/assets/image/index-background.png b/src/assets/image/index-background.png index ca158741..218e9135 100644 Binary files a/src/assets/image/index-background.png and b/src/assets/image/index-background.png differ diff --git a/src/assets/image/login-bg.png b/src/assets/image/login-bg.png index 8f9f072d..0a581aad 100644 Binary files a/src/assets/image/login-bg.png and b/src/assets/image/login-bg.png differ diff --git a/src/assets/img/map9.jpg b/src/assets/img/map9.jpg new file mode 100644 index 00000000..d5f755d0 Binary files /dev/null and b/src/assets/img/map9.jpg differ diff --git a/src/views/index.vue b/src/views/index.vue index 8fd57435..95b91a3e 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -518,7 +518,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 || item.id == 12|| item.id == 13); if (!foundObject) { this.$message('您当前没有权限查看!') return diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue index d26dc1d3..bc4ce23f 100644 --- a/src/views/page/largeScreen.vue +++ b/src/views/page/largeScreen.vue @@ -206,6 +206,22 @@ + +
+ + + + + + + + + + + + + +
@@ -383,7 +399,7 @@
+ v-if="limitUserId == 7 || limitUserId == 9 || limitUserId == 10 || limitUserId == 11 || limitUserId == 12|| limitUserId == 13">
@@ -653,7 +669,17 @@ 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 == 9) { + + // 左侧上部气象站charts + this.get_weather_echart_data(2023120613270131); + this.get_thisWeekTemperature_echart_data(2023120613270131); + this.get_environmentData(2024070113400048); + this.get_readControl_getState(2024070113400048); + // 左侧上部气象站 + this.getWeatherData(2023120613270131); + }else { + // 其他非指定id都默认第一个 // 获取控制器第一个Id const list = [] this.$store.state.equipmentList.forEach((el, index) => { @@ -687,16 +713,7 @@ export default { } - } else if (limitUserId == 9) { - - // 左侧上部气象站charts - this.get_weather_echart_data(2023120613270131); - this.get_thisWeekTemperature_echart_data(2023120613270131); - this.get_environmentData(2024070113400048); - this.get_readControl_getState(2024070113400048); - // 左侧上部气象站 - this.getWeatherData(2023120613270131); - } + } } }); }, @@ -961,7 +978,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|| el.id == 12|| el.id == 13))[0].id; if (this.limitUserId == 1) { this.drag_boxHandler(); this.dataInit(userId, this.limitUserId); @@ -989,6 +1006,9 @@ export default { }else if (this.limitUserId == 12) { this.drag_boxHandler12(); this.dataInit(userId, this.limitUserId); + }else if (this.limitUserId == 13) { + this.drag_boxHandler13(); + this.dataInit(userId, this.limitUserId); } } @@ -1086,7 +1106,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.limitUserId == 12|| this.limitUserId == 13) { this.get_readControl_getState(list[0].deviceId); } @@ -1226,6 +1246,63 @@ export default { // console.log(scale); } }; + }, + drag_boxHandler13() { + let demo = this.$refs.drag_box13; + demo = document.querySelector(".drag_box13"); //待拖拽元素 + 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_boxHandler12() { let demo = this.$refs.drag_box12; @@ -2283,6 +2360,136 @@ export default { cursor: pointer; } } + .drag_box13{ + 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 13%, + blue 73%, + transparent 97%); + } + .axis_shimen { + width: 0.3rem; + height: auto; + position: absolute; + top: 13%; + left:43.5%; + z-index: 99; + cursor: pointer; + } + .axis_shimen1 { + width: 0.3rem; + height: auto; + position: absolute; + top: 15%; + left:34.5%; + z-index: 99; + cursor: pointer; + } + .axis_shimen2 { + width: 0.3rem; + height: auto; + position: absolute; + top: 16%; + left:26%; + z-index: 99; + cursor: pointer; + } + .axis_shimen3 { + width: 0.3rem; + height: auto; + position: absolute; + top: 28%; + left:35%; + z-index: 99; + cursor: pointer; + } + .axis_shimen4 { + width: 0.3rem; + height: auto; + position: absolute; + top: 29%; + left:27%; + z-index: 99; + cursor: pointer; + } + .axis_shimen5 { + width: 0.3rem; + height: auto; + position: absolute; + top: 43%; + left:38.5%; + z-index: 99; + cursor: pointer; + } + .axis_shimen6 { + width: 0.3rem; + height: auto; + position: absolute; + top: 44%; + left:30.5%; + z-index: 99; + cursor: pointer; + } + .axis_shimen7 { + width: 0.3rem; + height: auto; + position: absolute; + top: 56%; + left:57%; + z-index: 99; + cursor: pointer; + } + .axis_shimen8 { + width: 0.3rem; + height: auto; + position: absolute; + top: 49%; + left:58%; + z-index: 99; + cursor: pointer; + } + .axis_shimen9 { + width: 0.3rem; + height: auto; + position: absolute; + top: 42%; + left:59%; + z-index: 99; + cursor: pointer; + } + .axis_shimen10 { + width: 0.3rem; + height: auto; + position: absolute; + top: 35%; + left:60%; + z-index: 99; + cursor: pointer; + } + .axis_shimen11 { + width: 0.3rem; + height: auto; + position: absolute; + top: 27%; + left:61%; + z-index: 99; + cursor: pointer; + } + } .drag_box12 { width: 100%; height: auto; diff --git a/src/views/page/largeScreen1.vue b/src/views/page/largeScreen1.vue index 685d559f..7fc7868c 100644 --- a/src/views/page/largeScreen1.vue +++ b/src/views/page/largeScreen1.vue @@ -19,10 +19,10 @@ {{ time.time }}
-
+
-
+
@@ -76,13 +76,13 @@
{{ item1.environmentDataId }} {{ - item1.environmentData + getTypeList(item1.formula) + item1.environmentData + getTypeList((item1.formula?item1.formula:1)) }}
@@ -95,10 +95,10 @@
-
+
-
+