From 0566418f1bd25c71fc494a1163cc85b1d554b879 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Mon, 8 May 2023 17:21:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=9B=BE=E5=B1=85=E5=B7=A6?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/element.less | 5 + src/views/components/carouselChart.vue | 4 +- src/views/pictureRotation/index.vue | 4 +- .../realTimeMonitor/components/infoDialog.vue | 74 ++++++++++ src/views/realTimeMonitor/index.vue | 22 ++- src/views/realTimeSearch/index.vue | 132 +++++++++++------- src/views/stritl/index copy.vue | 6 +- 7 files changed, 189 insertions(+), 58 deletions(-) create mode 100644 src/views/realTimeMonitor/components/infoDialog.vue diff --git a/src/assets/css/element.less b/src/assets/css/element.less index 28a9bb3..4fb8cff 100644 --- a/src/assets/css/element.less +++ b/src/assets/css/element.less @@ -37,3 +37,8 @@ display: flex; justify-content: flex-end; } +//弹窗 + +.el-dialog__body { + padding: 8px 20px; +} diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index 3026ea5..e03e126 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -135,14 +135,14 @@ export default { }, swiperOptionThumbs: { spaceBetween: 10, - centeredSlides: true, + centeredSlides: false, slidesPerView: "auto", touchRatio: 0.2, lazyLoading: true, //懒加载开启 slideToClickedSlide: true, lazy: { loadPrevNext: true, - loadPrevNextAmount: 3, + loadPrevNextAmount: 5, loadOnTransitionStart: true, //loadOnTransitionStart: true, }, diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue index 26510f4..a8784db 100644 --- a/src/views/pictureRotation/index.vue +++ b/src/views/pictureRotation/index.vue @@ -315,7 +315,7 @@ export default { position: absolute; bottom: 28px; left: 0px; - font-size: 15px; + font-size: 14px; background-color: #3a87ad !important; color: @color-white; font-weight: normal; @@ -328,7 +328,7 @@ export default { bottom: 4px; color: @color-white; left: 0px; - font-size: 15px; + font-size: 14px; background-color: #51b17c !important; font-weight: normal; margin-top: 2px; diff --git a/src/views/realTimeMonitor/components/infoDialog.vue b/src/views/realTimeMonitor/components/infoDialog.vue new file mode 100644 index 0000000..ea6ef6a --- /dev/null +++ b/src/views/realTimeMonitor/components/infoDialog.vue @@ -0,0 +1,74 @@ + + + diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index 85837c5..c394493 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -83,7 +83,7 @@ 获取GPS位置 - + 装置信息 关闭GPS - 声光报警 + > --> 历史图片 @@ -123,6 +123,7 @@ + @@ -140,12 +141,14 @@ import carouselChart from "../components/carouselChart.vue"; import setschedule from "./components/setschedule.vue"; import deviceUpgrade from "./components/deviceUpgrade.vue"; import pictureTags from "./components/pictureTags.vue"; +import infoDialog from "./components/infoDialog.vue"; export default { components: { carouselChart, setschedule, deviceUpgrade, pictureTags, + infoDialog, }, data() { return { @@ -327,6 +330,10 @@ export default { this.$refs.setschedule_ref.getSingleAccess(this.channelId); this.$refs.setschedule_ref.deviceList(); }, + // + handleShowInfo() { + this.$refs.infodialog_ref.display(); + }, handleShowErr() { this.$message({ message: "该功能暂未开发,敬请期待", @@ -402,8 +409,17 @@ export default { }) .then((res) => { console.log(res); + + this.$message({ + message: "手动拍照请求成功", + type: "success", + }); }) .catch((err) => { + this.$message({ + message: "手动拍照请求成失败", + type: "error", + }); console.log(err); //代码错误、请求失败捕获 }); }, diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue index c8d4a49..5bd44e3 100644 --- a/src/views/realTimeSearch/index.vue +++ b/src/views/realTimeSearch/index.vue @@ -5,27 +5,52 @@ - + - + - + - + - + 查询 @@ -78,60 +103,71 @@ import { getSearchInfo, getPictureList } from "@/utils/api/index"; export default { data() { return { - dyOptions: [],//电压数据 - xlOptions: [],//线路数据 - gtOptions: [],//杆塔数据 - tdOptions: [],//通道数据 + dyOptions: [], //电压数据 + xlOptions: [], //线路数据 + gtOptions: [], //杆塔数据 + tdOptions: [], //通道数据 formdata: { - dyVal:'', - xlVal:'', - gtVal: '', - tdVal: '', - timeVal: '', + dyVal: "", + xlVal: "", + gtVal: "", + tdVal: "", + timeVal: "", }, picList: [], page: 1, // 当前页数 - pageSize: 10, // 每页数量 + pageSize: 30, // 每页数量 total: 0, //总条数 loading: false, }; }, - mounted(){ - this.$set(this.formdata, "timeVal", [new Date(new Date().toLocaleDateString()).getTime(), new Date().getTime()]); - this.getSearchdy() - this.getPicData() + mounted() { + this.$set(this.formdata, "timeVal", [ + new Date(new Date().toLocaleDateString()).getTime(), + new Date().getTime(), + ]); + this.getSearchdy(); + this.getPicData(); }, methods: { //获取电压信息 - getSearchdy(){ - getSearchInfo({ type:1 }).then((res) => { - this.dyOptions = res.data.list; - this.formdata.dyVal = res.data.list[0].id - this.getSearchxl() - }).catch((err) => {}); + getSearchdy() { + getSearchInfo({ type: 1 }) + .then((res) => { + this.dyOptions = res.data.list; + this.formdata.dyVal = res.data.list[0].id; + this.getSearchxl(); + }) + .catch((err) => {}); }, //获取线路数据 - getSearchxl(){ - getSearchInfo({ type: 2, id: this.formdata.dyVal }).then((res) => { - this.xlOptions = res.data.list; - this.formdata.xlVal = res.data.list[0].id - this.getSearchgt() - }).catch((err) => {}); + getSearchxl() { + getSearchInfo({ type: 2, id: this.formdata.dyVal }) + .then((res) => { + this.xlOptions = res.data.list; + this.formdata.xlVal = res.data.list[0].id; + this.getSearchgt(); + }) + .catch((err) => {}); }, //获取杆塔数据 - getSearchgt(){ - getSearchInfo({ type: 3, id: this.formdata.xlVal }).then((res) => { - this.gtOptions = res.data.list; - this.formdata.gtVal = res.data.list[0].id - this.getSearchtd() - }).catch((err) => {}); + getSearchgt() { + getSearchInfo({ type: 3, id: this.formdata.xlVal }) + .then((res) => { + this.gtOptions = res.data.list; + this.formdata.gtVal = res.data.list[0].id; + this.getSearchtd(); + }) + .catch((err) => {}); }, //获取通道数据 - getSearchtd(){ - getSearchInfo({ type: 4, id: this.formdata.gtVal }).then((res) => { - this.tdOptions = res.data.list; - this.formdata.tdVal = res.data.list[0].id - }).catch((err) => {}); + getSearchtd() { + getSearchInfo({ type: 4, id: this.formdata.gtVal }) + .then((res) => { + this.tdOptions = res.data.list; + this.formdata.tdVal = res.data.list[0].id; + }) + .catch((err) => {}); }, //获取图片列表 getPicData() { @@ -152,18 +188,18 @@ export default { }, //查询 onSubmit() { - this.getPicData() + this.getPicData(); }, //点击分页 handleCurrentChange(val) { this.page = val; - this.getPicData() + this.getPicData(); }, //每页条数 - handleSizeChange(val){ + handleSizeChange(val) { this.pageSize = val; - this.getPicData() - } + this.getPicData(); + }, }, }; diff --git a/src/views/stritl/index copy.vue b/src/views/stritl/index copy.vue index 433303a..e95bac0 100644 --- a/src/views/stritl/index copy.vue +++ b/src/views/stritl/index copy.vue @@ -361,7 +361,7 @@ export default { padding: 8px; h3 { margin-bottom: 8px; - font-size: 15px; + font-size: 14px; } } .strRightTop, @@ -375,7 +375,7 @@ export default { padding: 8px; h3 { margin-bottom: 8px; - font-size: 15px; + font-size: 14px; } } .strRightTop { @@ -397,7 +397,7 @@ export default { .strRightBottom { h3 { margin-bottom: 8px; - font-size: 15px; + font-size: 14px; } .suggest { .attention {