diff --git a/src/App.vue b/src/App.vue index 7d70e66..22b276c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,17 +1,16 @@ - \ No newline at end of file + diff --git a/src/assets/css/theme.less b/src/assets/css/theme.less index 8a63793..b91500d 100644 --- a/src/assets/css/theme.less +++ b/src/assets/css/theme.less @@ -1,260 +1,276 @@ //蓝色主题 .blueStyle { - .header { - background: #20a0ff; - } - - .el-menu { - background: #20a0ff; - - i { - color: @color-white !important; - } + .header { + background: #20a0ff; + } - .el-menu-item { - color: @color-white; - } + .el-menu { + background: #20a0ff; - .el-menu-item.is-active { - color: @color-white; - } + i { + color: @color-white !important; + } - .el-submenu .el-submenu__title { - color: @color-white; - } + .el-menu-item { + color: @color-white; + } - .el-menu-item:not(.is-disabled):focus, - .el-menu-item:not(.is-disabled):hover { - color: #20a0ff; - background-color: @color-white; - border-bottom: 2px solid @color-white; + .el-menu-item.is-active { + color: @color-white; + } - i { - color: #20a0ff !important; - } - } + .el-submenu .el-submenu__title { + color: @color-white; + } - .el-submenu:focus .el-submenu__title, - .el-submenu:hover .el-submenu__title { - color: #20a0ff !important; - background-color: @color-white; - border-bottom: 2px solid @color-white; + .el-menu-item:not(.is-disabled):focus, + .el-menu-item:not(.is-disabled):hover { + color: #20a0ff; + background-color: @color-white; + border-bottom: 2px solid @color-white; - i { - color: #20a0ff !important; - } - } + i { + color: #20a0ff !important; + } + } - .el-submenu.is-active .el-submenu__title { - color: @color-white; - } + .el-submenu:focus .el-submenu__title, + .el-submenu:hover .el-submenu__title { + color: #20a0ff !important; + background-color: @color-white; + border-bottom: 2px solid @color-white; + i { + color: #20a0ff !important; + } } - .tags-li.active { - border: 1px solid #20a0ff; - background-color: #20a0ff; + .el-submenu.is-active .el-submenu__title { + color: @color-white; } + } + + .tags-li.active { + border: 1px solid #20a0ff; + background-color: #20a0ff; + } } //红色主题 .redStyle { - .header { - background: #EE320C; - } + .header { + background: #ee320c; + } - .el-menu { - background: #EE320C; + .el-menu { + background: #ee320c; - i { - color: @color-white !important; - } - - .el-menu-item { - color: @color-white; - } - - .el-menu-item.is-active { - color: @color-white; - } - - .el-submenu .el-submenu__title { - color: @color-white; - } - - .el-menu-item:not(.is-disabled):focus, - .el-menu-item:not(.is-disabled):hover { - color: #EE320C; - background-color: @color-white; - border-bottom: 2px solid @color-white; + i { + color: @color-white !important; + } - i { - color: #EE320C !important; - } - } + .el-menu-item { + color: @color-white; + } - .el-submenu:focus .el-submenu__title, - .el-submenu:hover .el-submenu__title { - color: #EE320C !important; - background-color: @color-white; - border-bottom: 2px solid @color-white; + .el-menu-item.is-active { + color: @color-white; + } - i { - color: #EE320C !important; - } - } + .el-submenu .el-submenu__title { + color: @color-white; + } - .el-submenu.is-active .el-submenu__title { - color: @color-white; - } + .el-menu-item:not(.is-disabled):focus, + .el-menu-item:not(.is-disabled):hover { + color: #ee320c; + background-color: @color-white; + border-bottom: 2px solid @color-white; + i { + color: #ee320c !important; + } } - .sidebar .el-menu--horizontal .el-menu-item.is-active i { - color: #EE320C; - } + .el-submenu:focus .el-submenu__title, + .el-submenu:hover .el-submenu__title { + color: #ee320c !important; + background-color: @color-white; + border-bottom: 2px solid @color-white; - .sidebar .el-menu--horizontal .el-submenu.is-active .el-submenu__title>i:first-child { - color: #EE320C; + i { + color: #ee320c !important; + } } - .tags-li.active { - border: 1px solid #EE320C; - background-color: #EE320C; + .el-submenu.is-active .el-submenu__title { + color: @color-white; } - + } + + .sidebar .el-menu--horizontal .el-menu-item.is-active i { + color: #ee320c; + } + + .sidebar + .el-menu--horizontal + .el-submenu.is-active + .el-submenu__title + > i:first-child { + color: #ee320c; + } + + .tags-li.active { + border: 1px solid #ee320c; + background-color: #ee320c; + } } //绿色主题 .greenStyle { - .header { - background: #25EE28; - } - - .el-menu { - background: #25EE28; - - i { - color: @color-white !important; - } - - .el-menu-item { - color: @color-white; - } - - .el-menu-item.is-active { - color: @color-white; - } + .header { + background: #00a096; + } - .el-submenu .el-submenu__title { - color: @color-white; - } + .el-menu { + background: #00a096; - .el-menu-item:not(.is-disabled):focus, - .el-menu-item:not(.is-disabled):hover { - color: #25EE28; - background-color: @color-white; - border-bottom: 2px solid @color-white; + i { + color: @color-white !important; + } - i { - color: #25EE28 !important; - } - } + .el-menu-item { + color: @color-white; + } - .el-submenu:focus .el-submenu__title, - .el-submenu:hover .el-submenu__title { - color: #25EE28 !important; - background-color: @color-white; - border-bottom: 2px solid @color-white; + .el-menu-item.is-active { + color: @color-white; + } - i { - color: #25EE28 !important; - } - } + .el-submenu .el-submenu__title { + color: @color-white; + } - .el-submenu.is-active .el-submenu__title { - color: @color-white; - } + .el-menu-item:not(.is-disabled):focus, + .el-menu-item:not(.is-disabled):hover { + color: #00a096; + background-color: @color-white; + border-bottom: 2px solid @color-white; + i { + color: #00a096 !important; + } } - .sidebar .el-menu--horizontal .el-menu-item.is-active i { - color: #25EE28; - } + .el-submenu:focus .el-submenu__title, + .el-submenu:hover .el-submenu__title { + color: #00a096 !important; + background-color: @color-white; + border-bottom: 2px solid @color-white; - .sidebar .el-menu--horizontal .el-submenu.is-active .el-submenu__title>i:first-child { - color: #25EE28; + i { + color: #00a096 !important; + } } - .tags-li.active { - border: 1px solid #25EE28; - background-color: #25EE28; + .el-submenu.is-active .el-submenu__title { + color: @color-white; } - + } + + .sidebar .el-menu--horizontal .el-menu-item.is-active i { + color: #00a096; + } + + .sidebar + .el-menu--horizontal + .el-submenu.is-active + .el-submenu__title + > i:first-child { + color: #00a096; + } + + .tags-li.active { + border: 1px solid #00a096; + background-color: #00a096; + } } //橙色主题 .orangeStyle { - .header { - background: #f08200; + .header { + background: #f08200; + } + .el-menu { + background: #f08200; + + i { + color: @color-white !important; } - .el-menu { - background: #f08200; - - i { - color: @color-white !important; - } - - .el-menu-item { - color: @color-white; - } - - .el-menu-item.is-active { - color: @color-white; - } - - .el-submenu .el-submenu__title { - color: @color-white; - } - - .el-menu-item:not(.is-disabled):focus, - .el-menu-item:not(.is-disabled):hover { - color: #f08200; - background-color: @color-white; - border-bottom: 2px solid @color-white; - - i { - color: #f08200 !important; - } - } - - .el-submenu:focus .el-submenu__title, - .el-submenu:hover .el-submenu__title { - color: #f08200 !important; - background-color: @color-white; - border-bottom: 2px solid @color-white; - - i { - color: #f08200 !important; - } - } - - .el-submenu.is-active .el-submenu__title { - color: @color-white; - } + .el-menu-item { + color: @color-white; } - .sidebar .el-menu--horizontal .el-menu-item.is-active i { - color: #f08200; + + .el-menu-item.is-active { + color: @color-white; } - .sidebar .el-menu--horizontal .el-submenu.is-active .el-submenu__title>i:first-child { - color: #f08200; + .el-submenu .el-submenu__title { + color: @color-white; } - .tags-li.active { - border: 1px solid #f08200; - background-color: #f08200; + .el-menu-item:not(.is-disabled):focus, + .el-menu-item:not(.is-disabled):hover { + color: #f08200; + background-color: @color-white; + border-bottom: 2px solid @color-white; + + i { + color: #f08200 !important; + } } -} \ No newline at end of file + .el-submenu:focus .el-submenu__title, + .el-submenu:hover .el-submenu__title { + color: #f08200 !important; + background-color: @color-white; + border-bottom: 2px solid @color-white; + + i { + color: #f08200 !important; + } + } + + .el-submenu.is-active .el-submenu__title { + color: @color-white; + } + } + .sidebar .el-menu--horizontal .el-menu-item.is-active i { + color: #f08200; + } + + .sidebar + .el-menu--horizontal + .el-submenu.is-active + .el-submenu__title + > i:first-child { + color: #f08200; + } + .sideBar { + .el-tree--highlight-current + .el-tree-node.is-current + > .el-tree-node__content { + // 设置颜色 + color: #fff; + background: #f08200 !important; + } + } + .gallery-thumbs .swiper-slide-active { + border: 3px solid #f08200 !important; + } + .tags-li.active { + border: 1px solid #f08200; + background-color: #f08200; + } +} diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue index c1ed6d8..bab90b1 100644 --- a/src/components/common/Header.vue +++ b/src/components/common/Header.vue @@ -69,7 +69,7 @@ export default { label: "红色", }, { - value: "#25EE28", + value: "#00a096", label: "绿色", }, { @@ -110,7 +110,8 @@ export default { app.classList.remove("blueStyle", "greenStyle", "orangeStyle"); app.classList.add("redStyle"); } else if (colorTheme.label === "绿色") { - colorTheme.value = "#25EE28"; + colorTheme.value = "#00a096"; + app.classList.remove("blueStyle", "redStyle", "orangeStyle"); app.classList.add("greenStyle"); } else if (colorTheme.label === "橙色") { colorTheme.value = "#f08200"; @@ -148,37 +149,10 @@ export default { psdDialogClose() { this.dialogFormPsd = false; }, - - // 全屏事件 - // handleFullScreen() { - // let element = document.documentElement; - // if (this.fullscreen) { - // if (document.exitFullscreen) { - // document.exitFullscreen(); - // } else if (document.webkitCancelFullScreen) { - // document.webkitCancelFullScreen(); - // } else if (document.mozCancelFullScreen) { - // document.mozCancelFullScreen(); - // } else if (document.msExitFullscreen) { - // document.msExitFullscreen(); - // } - // } else { - // if (element.requestFullscreen) { - // element.requestFullscreen(); - // } else if (element.webkitRequestFullScreen) { - // element.webkitRequestFullScreen(); - // } else if (element.mozRequestFullScreen) { - // element.mozRequestFullScreen(); - // } else if (element.msRequestFullscreen) { - // // IE11 - // element.msRequestFullscreen(); - // } - // } - // this.fullscreen = !this.fullscreen; - // }, }, created() { - this.colorValue = this.colorList[0].label; + this.colorValue = this.colorList[3].label; + this.changeTheme(this.colorList[3].value); }, mounted() {}, }; diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue index f8228e8..99c8302 100644 --- a/src/components/common/Sidebar.vue +++ b/src/components/common/Sidebar.vue @@ -56,44 +56,49 @@ export default { items: [ // { - // icon: 'el-icon-s-home', - // index: 'stritl', - // title: '系统首页' + // icon: "el-icon-s-home", + // index: "stritl", + // title: "系统首页", // }, { icon: "el-icon-camera", index: "realTimeMonitor", title: "实时监控", }, + { + icon: "el-icon-setting", + index: "devicePhotoSchedule", + title: "拍照时间表设置", + }, // { - // icon: 'el-icon-film', - // index: 'pictureRotation', - // title: '图片轮巡' + // icon: "el-icon-film", + // index: "pictureRotation", + // title: "图片轮巡", // }, // { - // icon: 'el-icon-video-camera', - // index: '3', - // title: '视频监控', - // subs: [ - // { - // index: 'videoMonitor', - // title: '监控视频' - // }, - // { - // index: 'videoHistory', - // title: '视频回放' - // } - // ] - // } + // icon: "el-icon-video-camera", + // index: "3", + // title: "视频监控", + // subs: [ + // { + // index: "videoMonitor", + // title: "监控视频", + // }, + // { + // index: "videoHistory", + // title: "视频回放", + // }, + // ], + // }, // { - // icon: 'el-icon-warning-outline', - // index: 'dashboard', - // title: '预警处理' + // icon: "el-icon-warning-outline", + // index: "dashboard", + // title: "预警处理", // }, // { - // icon: 'el-icon-bell', - // index: 'photoAlarm', - // title: '告警处理' + // icon: "el-icon-bell", + // index: "photoAlarm", + // title: "告警处理", // }, // { // icon: 'el-icon-setting', diff --git a/src/main.js b/src/main.js index e1149bd..cabb5b6 100644 --- a/src/main.js +++ b/src/main.js @@ -27,6 +27,10 @@ import "./assets/css/global.less"; //全局定义颜色 import md5 from "js-md5"; Vue.prototype.$md5 = md5; +import moment from "moment"; // 导入文件 +// 注册全局 moment +Vue.prototype.$moment = moment; + Vue.config.productionTip = false; new Vue({ diff --git a/src/photo.js b/src/photo.js deleted file mode 100644 index 689350a..0000000 --- a/src/photo.js +++ /dev/null @@ -1,464 +0,0 @@ -const photoVideo = [ - { - "fileId": "2382c462-5850-4cc9-8413-8eb20a9c104e", - "fileName": "shxy2023013100001_20230302100015_2_255.jpg", - "filePath": "/local/shxy2023013100001/202303/shxy2023013100001_20230302100015_2_255.jpg", - "captureTime": "2023-03-02 10:00:15", - "fileSize": null, - "fileType": 0, - "companyId": "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - "companyName": null, - "lineId": "8cee6df6-46c7-4f6d-abfa-b2cfecdcf31f", - "lineName": null, - "towerId": "f0b2d5c3-500f-4107-81ff-501757a02064", - "towerName": null, - "orientation": "1", - "orientationName": "大号侧", - "monitorPointId": "9455c6a5-1c03-840a-490f-3d585e316fa1", - "saveTime": "2023-03-02 10:00:25.000099", - "uploadTime": null, - "analyzeTime": null, - "status": 1, - "discernStatus": null, - "uploadSpeed": 0, - "collectConfigId": null, - "tfsTag": null, - "tfsPicName": null, - "coverPicName": "", - "camera": null, - "meid": null, - "temperature": null, - "voltage": null, - "dbmLevel": null, - "energy": null, - "netType": null, - "picGrade": null, - "channel": null, - "deviceId": "466470e9-d35e-4667-9963-f78163830fbc", - "picOriginType": null, - "hisflag": null, - "timeConsuming": null, - "markAlarmType": null, - "dangerLevel": null, - "isMark": null, - "presettingNum": null, - "presettingName": null, - "alarmFilePath": "" - }, - { - "fileId": "6eca3e84-7988-4c83-894a-0d2fb5157e33", - "fileName": "shxy2023013100001_20230302100007_1_255.jpg", - "filePath": "/local/shxy2023013100001/202303/shxy2023013100001_20230302100007_1_255.jpg", - "captureTime": "2023-03-02 10:00:07", - "fileSize": null, - "fileType": 0, - "companyId": "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - "companyName": null, - "lineId": "8cee6df6-46c7-4f6d-abfa-b2cfecdcf31f", - "lineName": null, - "towerId": "f0b2d5c3-500f-4107-81ff-501757a02064", - "towerName": null, - "orientation": "2", - "orientationName": "小号侧", - "monitorPointId": "12bf611b-ef23-6eca-dc61-2147baf24ecf", - "saveTime": "2023-03-02 10:00:18.000247", - "uploadTime": null, - "analyzeTime": null, - "status": 1, - "discernStatus": null, - "uploadSpeed": 0, - "collectConfigId": null, - "tfsTag": null, - "tfsPicName": null, - "coverPicName": "", - "camera": null, - "meid": null, - "temperature": null, - "voltage": null, - "dbmLevel": null, - "energy": null, - "netType": null, - "picGrade": null, - "channel": null, - "deviceId": "466470e9-d35e-4667-9963-f78163830fbc", - "picOriginType": null, - "hisflag": null, - "timeConsuming": null, - "markAlarmType": null, - "dangerLevel": null, - "isMark": null, - "presettingNum": null, - "presettingName": null, - "alarmFilePath": "" - }, - { - "fileId": "c9eb0ed1-731f-4543-bb87-3f67d7778796", - "fileName": "shxy2023013100001_20230302090018_2_255.jpg", - "filePath": "/local/shxy2023013100001/202303/shxy2023013100001_20230302090018_2_255.jpg", - "captureTime": "2023-03-02 09:00:18", - "fileSize": null, - "fileType": 0, - "companyId": "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - "companyName": null, - "lineId": "8cee6df6-46c7-4f6d-abfa-b2cfecdcf31f", - "lineName": null, - "towerId": "f0b2d5c3-500f-4107-81ff-501757a02064", - "towerName": null, - "orientation": "1", - "orientationName": "大号侧", - "monitorPointId": "9455c6a5-1c03-840a-490f-3d585e316fa1", - "saveTime": "2023-03-02 09:00:28.000053", - "uploadTime": null, - "analyzeTime": null, - "status": 1, - "discernStatus": null, - "uploadSpeed": 0, - "collectConfigId": null, - "tfsTag": null, - "tfsPicName": null, - "coverPicName": "", - "camera": null, - "meid": null, - "temperature": null, - "voltage": null, - "dbmLevel": null, - "energy": null, - "netType": null, - "picGrade": null, - "channel": null, - "deviceId": "466470e9-d35e-4667-9963-f78163830fbc", - "picOriginType": null, - "hisflag": null, - "timeConsuming": null, - "markAlarmType": null, - "dangerLevel": null, - "isMark": null, - "presettingNum": null, - "presettingName": null, - "alarmFilePath": "" - }, - { - "fileId": "63457b50-aa5e-4558-8849-f3576e13a6cb", - "fileName": "shxy2023013100001_20230302090010_1_255.jpg", - "filePath": "/local/shxy2023013100001/202303/shxy2023013100001_20230302090010_1_255.jpg", - "captureTime": "2023-03-02 09:00:10", - "fileSize": null, - "fileType": 0, - "companyId": "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - "companyName": null, - "lineId": "8cee6df6-46c7-4f6d-abfa-b2cfecdcf31f", - "lineName": null, - "towerId": "f0b2d5c3-500f-4107-81ff-501757a02064", - "towerName": null, - "orientation": "2", - "orientationName": "小号侧", - "monitorPointId": "12bf611b-ef23-6eca-dc61-2147baf24ecf", - "saveTime": "2023-03-02 09:00:21.000113", - "uploadTime": null, - "analyzeTime": null, - "status": 1, - "discernStatus": null, - "uploadSpeed": 0, - "collectConfigId": null, - "tfsTag": null, - "tfsPicName": null, - "coverPicName": "", - "camera": null, - "meid": null, - "temperature": null, - "voltage": null, - "dbmLevel": null, - "energy": null, - "netType": null, - "picGrade": null, - "channel": null, - "deviceId": "466470e9-d35e-4667-9963-f78163830fbc", - "picOriginType": null, - "hisflag": null, - "timeConsuming": null, - "markAlarmType": null, - "dangerLevel": null, - "isMark": null, - "presettingNum": null, - "presettingName": null, - "alarmFilePath": "" - }, - { - "fileId": "3fa69fb6-332d-4935-814d-6fd9a9e03b1c", - "fileName": "shxy2023013100001_20230302080016_2_255.jpg", - "filePath": "/local/shxy2023013100001/202303/shxy2023013100001_20230302080016_2_255.jpg", - "captureTime": "2023-03-02 08:00:16", - "fileSize": null, - "fileType": 0, - "companyId": "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - "companyName": null, - "lineId": "8cee6df6-46c7-4f6d-abfa-b2cfecdcf31f", - "lineName": null, - "towerId": "f0b2d5c3-500f-4107-81ff-501757a02064", - "towerName": null, - "orientation": "1", - "orientationName": "大号侧", - "monitorPointId": "9455c6a5-1c03-840a-490f-3d585e316fa1", - "saveTime": "2023-03-02 08:00:26.000759", - "uploadTime": null, - "analyzeTime": null, - "status": 1, - "discernStatus": null, - "uploadSpeed": 0, - "collectConfigId": null, - "tfsTag": null, - "tfsPicName": null, - "coverPicName": "", - "camera": null, - "meid": null, - "temperature": null, - "voltage": null, - "dbmLevel": null, - "energy": null, - "netType": null, - "picGrade": null, - "channel": null, - "deviceId": "466470e9-d35e-4667-9963-f78163830fbc", - "picOriginType": null, - "hisflag": null, - "timeConsuming": null, - "markAlarmType": null, - "dangerLevel": null, - "isMark": null, - "presettingNum": null, - "presettingName": null, - "alarmFilePath": "" - }, - { - "fileId": "67634860-cd95-482f-857b-3d1190e37b05", - "fileName": "shxy2023013100001_20230302080008_1_255.jpg", - "filePath": "/local/shxy2023013100001/202303/shxy2023013100001_20230302080008_1_255.jpg", - "captureTime": "2023-03-02 08:00:08", - "fileSize": null, - "fileType": 0, - "companyId": "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - "companyName": null, - "lineId": "8cee6df6-46c7-4f6d-abfa-b2cfecdcf31f", - "lineName": null, - "towerId": "f0b2d5c3-500f-4107-81ff-501757a02064", - "towerName": null, - "orientation": "2", - "orientationName": "小号侧", - "monitorPointId": "12bf611b-ef23-6eca-dc61-2147baf24ecf", - "saveTime": "2023-03-02 08:00:19.000241", - "uploadTime": null, - "analyzeTime": null, - "status": 1, - "discernStatus": null, - "uploadSpeed": 0, - "collectConfigId": null, - "tfsTag": null, - "tfsPicName": null, - "coverPicName": "", - "camera": null, - "meid": null, - "temperature": null, - "voltage": null, - "dbmLevel": null, - "energy": null, - "netType": null, - "picGrade": null, - "channel": null, - "deviceId": "466470e9-d35e-4667-9963-f78163830fbc", - "picOriginType": null, - "hisflag": null, - "timeConsuming": null, - "markAlarmType": null, - "dangerLevel": null, - "isMark": null, - "presettingNum": null, - "presettingName": null, - "alarmFilePath": "" - }, - { - "fileId": "f2cd8e33-4f97-43a7-b5b2-569bd6bfe9c1", - "fileName": "shxy2023013100001_20230302070016_2_255.jpg", - "filePath": "/local/shxy2023013100001/202303/shxy2023013100001_20230302070016_2_255.jpg", - "captureTime": "2023-03-02 07:00:16", - "fileSize": null, - "fileType": 0, - "companyId": "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - "companyName": null, - "lineId": "8cee6df6-46c7-4f6d-abfa-b2cfecdcf31f", - "lineName": null, - "towerId": "f0b2d5c3-500f-4107-81ff-501757a02064", - "towerName": null, - "orientation": "1", - "orientationName": "大号侧", - "monitorPointId": "9455c6a5-1c03-840a-490f-3d585e316fa1", - "saveTime": "2023-03-02 07:00:26.000512", - "uploadTime": null, - "analyzeTime": null, - "status": 1, - "discernStatus": null, - "uploadSpeed": 0, - "collectConfigId": null, - "tfsTag": null, - "tfsPicName": null, - "coverPicName": "", - "camera": null, - "meid": null, - "temperature": null, - "voltage": null, - "dbmLevel": null, - "energy": null, - "netType": null, - "picGrade": null, - "channel": null, - "deviceId": "466470e9-d35e-4667-9963-f78163830fbc", - "picOriginType": null, - "hisflag": null, - "timeConsuming": null, - "markAlarmType": null, - "dangerLevel": null, - "isMark": null, - "presettingNum": null, - "presettingName": null, - "alarmFilePath": "" - }, - { - "fileId": "3efade4a-6a35-40c3-b3f5-454feab69bea", - "fileName": "shxy2023013100001_20230302070007_1_255.jpg", - "filePath": "/local/shxy2023013100001/202303/shxy2023013100001_20230302070007_1_255.jpg", - "captureTime": "2023-03-02 07:00:07", - "fileSize": null, - "fileType": 0, - "companyId": "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - "companyName": null, - "lineId": "8cee6df6-46c7-4f6d-abfa-b2cfecdcf31f", - "lineName": null, - "towerId": "f0b2d5c3-500f-4107-81ff-501757a02064", - "towerName": null, - "orientation": "2", - "orientationName": "小号侧", - "monitorPointId": "12bf611b-ef23-6eca-dc61-2147baf24ecf", - "saveTime": "2023-03-02 07:00:18.000115", - "uploadTime": null, - "analyzeTime": null, - "status": 1, - "discernStatus": null, - "uploadSpeed": 0, - "collectConfigId": null, - "tfsTag": null, - "tfsPicName": null, - "coverPicName": "", - "camera": null, - "meid": null, - "temperature": null, - "voltage": null, - "dbmLevel": null, - "energy": null, - "netType": null, - "picGrade": null, - "channel": null, - "deviceId": "466470e9-d35e-4667-9963-f78163830fbc", - "picOriginType": null, - "hisflag": null, - "timeConsuming": null, - "markAlarmType": null, - "dangerLevel": null, - "isMark": null, - "presettingNum": null, - "presettingName": null, - "alarmFilePath": "" - }, - { - "fileId": "a112b9bb-fd47-4e90-8747-01319930f171", - "fileName": "shxy2023013100001_20230302060018_2_255.jpg", - "filePath": "/local/shxy2023013100001/202303/shxy2023013100001_20230302060018_2_255.jpg", - "captureTime": "2023-03-02 06:00:18", - "fileSize": null, - "fileType": 0, - "companyId": "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - "companyName": null, - "lineId": "8cee6df6-46c7-4f6d-abfa-b2cfecdcf31f", - "lineName": null, - "towerId": "f0b2d5c3-500f-4107-81ff-501757a02064", - "towerName": null, - "orientation": "1", - "orientationName": "大号侧", - "monitorPointId": "9455c6a5-1c03-840a-490f-3d585e316fa1", - "saveTime": "2023-03-02 06:00:28.000832", - "uploadTime": null, - "analyzeTime": null, - "status": 1, - "discernStatus": null, - "uploadSpeed": 0, - "collectConfigId": null, - "tfsTag": null, - "tfsPicName": null, - "coverPicName": "", - "camera": null, - "meid": null, - "temperature": null, - "voltage": null, - "dbmLevel": null, - "energy": null, - "netType": null, - "picGrade": null, - "channel": null, - "deviceId": "466470e9-d35e-4667-9963-f78163830fbc", - "picOriginType": null, - "hisflag": null, - "timeConsuming": null, - "markAlarmType": null, - "dangerLevel": null, - "isMark": null, - "presettingNum": null, - "presettingName": null, - "alarmFilePath": "" - }, - { - "fileId": "6a1567fa-6a21-4d4f-b0b8-49a9ea633649", - "fileName": "shxy2023013100001_20230302060009_1_255.jpg", - "filePath": "/local/shxy2023013100001/202303/shxy2023013100001_20230302060009_1_255.jpg", - "captureTime": "2023-03-02 06:00:09", - "fileSize": null, - "fileType": 0, - "companyId": "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - "companyName": null, - "lineId": "8cee6df6-46c7-4f6d-abfa-b2cfecdcf31f", - "lineName": null, - "towerId": "f0b2d5c3-500f-4107-81ff-501757a02064", - "towerName": null, - "orientation": "2", - "orientationName": "小号侧", - "monitorPointId": "12bf611b-ef23-6eca-dc61-2147baf24ecf", - "saveTime": "2023-03-02 06:00:21.000806", - "uploadTime": null, - "analyzeTime": null, - "status": 1, - "discernStatus": null, - "uploadSpeed": 0, - "collectConfigId": null, - "tfsTag": null, - "tfsPicName": null, - "coverPicName": "", - "camera": null, - "meid": null, - "temperature": null, - "voltage": null, - "dbmLevel": null, - "energy": null, - "netType": null, - "picGrade": null, - "channel": null, - "deviceId": "466470e9-d35e-4667-9963-f78163830fbc", - "picOriginType": null, - "hisflag": null, - "timeConsuming": null, - "markAlarmType": null, - "dangerLevel": null, - "isMark": null, - "presettingNum": null, - "presettingName": null, - "alarmFilePath": "" - } -] - -export default photoVideo \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index d29823c..493c4a3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,7 +6,7 @@ Vue.use(VueRouter); const routes = [ { path: "/", - redirect: "/lineInformation", + redirect: "/realTimeMonitor", }, { path: "/", @@ -65,6 +65,14 @@ const routes = [ ), meta: { title: "视频回放", icon: "el-icon-video-camera" }, }, + { + path: "/devicePhotoSchedule", + component: () => + import( + /* webpackChunkName: "tabs" */ "../views/devicePhotoSchedule/index.vue" + ), + meta: { title: "拍照时间表设置", icon: "el-icon-setting" }, + }, { path: "/photoAlarm", component: () => @@ -168,7 +176,7 @@ const routes = [ ]; const router = new VueRouter({ - mode: "history", + mode: "hash", base: process.env.BASE_URL, routes, }); diff --git a/src/testjson.js b/src/testjson.js deleted file mode 100644 index 92f5c3c..0000000 --- a/src/testjson.js +++ /dev/null @@ -1,1490 +0,0 @@ -const getTowerLinePoint = { - statusCode: "0000", - statusMessage: null, - data: [ - { - dataType: "company", - id: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - text: "xytest", - state: "closed", - iconCls: "cls-company", - children: [ - { - code: "5", - dataType: "voltage", - id: "6c5a3237-783a-4c56-b10f-e471609c0805", - text: "220kV", - state: "closed", - iconCls: "cls-voltage", - children: [ - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [ - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "eef6de57-9c01-4651-bab2-526b140a255c", - text: "RP-1", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "9ae95f0a-7592-4587-a7dd-4d71120f8150", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "acc34e96-d22c-9e6d-1083-6d63288b0435", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - ], - dataType: "line", - id: "2e24a182-b1a5-4135-b473-b8eee2c5193e", - text: "I1测试线路-RP", - state: "closed", - iconCls: "cls-line", - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [ - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "2ab9a074-ca3a-4223-aa79-d17b609c69d3", - text: "XYIGQ10C221000003", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "c18c871a-1d2b-4022-805a-a9a0b4caa4be", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "1055cc8c-07c4-e09b-846d-543aecc8c8c1", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "6e0859ec-f49e-d19e-c716-b6d8533052d7", - text: "3.10", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "448dffea-c787-40e3-be37-a95c8efbbf34", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "f8d72bd0-7715-2975-dde1-cf59dcb2fa7e", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "f0b2d5c3-500f-4107-81ff-501757a02064", - text: "shxy2023013100001", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "466470e9-d35e-4667-9963-f78163830fbc", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "9455c6a5-1c03-840a-490f-3d585e316fa1", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "136b8b5f-eb88-46b5-9d23-32fc9c0cb4d4", - text: "XYIGQ10C221000015", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "8f4684a3-475e-402d-aa71-4ea6ce55e215", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "9838764f-b4d6-f263-0ae7-e410f4eecdb5", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "ef5ad884-6eaa-4ccc-b6b9-4861fd75c0af", - text: "XYIGQ10C221000068", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "cb9cdc76-e129-4936-a788-5f05c60247f2", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "b4101da9-6eb9-7a3a-b583-64c83ad36775", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "484102bb-16c7-4426-8a39-df57648a9515", - text: "SHXYTSZY202303001", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "5111c8c5-2637-4e18-9a2d-0f10a7afb0fa", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "56f7071e-f5c0-b54e-d487-e34e28768b84", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "430fb88b-3e5e-4426-bd51-bf3fa8d2de88", - text: "XYIGQ10C221000012", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "1f7fe3bf-76ec-4998-b175-93c295e433e5", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "ee9df0cb-a7f4-2914-f4db-bdda4e650ea0", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "040cddb3-f4a5-41f3-89d5-bf8cd94c8c1e", - text: "TS202211161234003", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "4291cd84-f2a1-4f2f-9401-9fb12e93bf2b", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "d0f85d9a-8323-4259-c434-2b4473d23ba0", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "e8ea81ff-f837-4b2a-b2b6-f0d2a3c5fae6", - text: "SHXYTSZY202303002", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "67ac8b5b-bd4e-4f5e-ad7b-6fb1561ae43d", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "bfab0ef1-5941-8408-8480-6763b64931e9", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "38fb2783-4d41-490d-8b80-806ecb4822e0", - text: "XYIGQ10C221000080", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "097ba6dc-9ece-4da4-a636-00eacc39fad5", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "db5e1b58-abd5-dea8-856d-69e992fda6f0", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "3303ce2e-3212-4755-ad2d-b317f4970679", - text: "XYIGQ10C221000016", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "39a5064d-96ea-4327-80b8-7e877e5e098e", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "4c7b6e8c-09de-4300-e024-485bf6b103a5", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "bd9be742-ad90-f868-7caa-58461169e99c", - text: "3.9", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "f4844b6b-4516-4e9c-9650-4f94cb4e3ceb", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "b20869ec-9f54-a058-996a-9df03442aca4", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - ], - dataType: "line", - id: "8cee6df6-46c7-4f6d-abfa-b2cfecdcf31f", - text: "i1测试线路-SH", - state: "closed", - iconCls: "cls-line", - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [ - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "8ba12eb9-ba4b-4d6c-a84c-2f50329da06d", - text: "DS000000000000001", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "a986f42c-2e45-4ccb-95d1-d57bfded8938", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "e3db71be-1ad6-b59a-15e9-c15ccdbf7ea4", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "1fa8c304-add5-40d9-ab21-cb7023e3860a", - text: "TS202211161234010", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "c22628ef-f39d-475f-af0d-d8ffc764f562", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "73cb88bf-c5aa-47b8-140f-0d6fa2c8ebb1", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "49e760fe-a9cf-4c60-a493-cdb4f965155f", - text: "TS202211161234008", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "8e93e127-6715-4892-b480-894ae5ffe8aa", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "ed2600f9-ddb6-ead4-4043-3f9208ed9060", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "1064c23e-aa56-4413-8aec-273632aa3114", - text: "TS202211161234007", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "a2c329d5-80d6-465c-930f-d3b6cfd2d375", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "65ff2218-c020-8905-c084-117435d8427a", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "b8c40d47-be32-45bd-8ae5-cf0c66a2afc8", - text: "DSDZ20221104V0009", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "1bb35068-7c4b-4155-8a22-bfb788676fc1", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "9c18975e-022f-7376-5037-0d2dac2bd016", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "a73733f3-1903-4a59-992c-af7c581708f4", - text: "XYIGQ10CW23030001", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "6b71a418-bb9e-41f5-b9a4-39b0ff03a742", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "4fdaca08-d476-fb8b-fe58-b0ced69dcc9e", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "3fcbb74b-fa2a-4a61-845b-d9a242f352ec", - text: "TS202211161234009", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "64971988-3b3d-4811-9a57-00820a6a3d8d", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "cada2f25-28ac-f5e5-4a33-f2511a446e5a", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "a112fe8e-fbea-4053-861a-4e0b8e7597fa", - text: "TS202211161234002", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "9ad87e72-1dc7-4b50-90fb-a76366d9ad11", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "703e3f65-c997-a41d-4c02-b14cfe4fee6c", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "9b6dfcae-d51b-4168-ad94-b5934456277b", - text: "TS202211161234006", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "5227f711-aebc-4d0b-a9df-0e8d45ced808", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "3cffb4f5-e682-993e-c398-55e14010b041", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - ], - dataType: "line", - id: "87bbf46c-472a-4244-a8df-aa740c2feb3d", - text: "I1测试线路-SZ", - state: "closed", - iconCls: "cls-line", - }, - ], - }, - { - code: "10", - dataType: "voltage", - id: "7389f9fc-100c-4ee2-b1ba-cbfe79ea06cd", - text: "15kV", - state: "closed", - iconCls: "cls-voltage", - children: [ - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [ - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "d87e9011-fe1f-4056-b730-695a1eff2513", - text: "100", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "09e5f6a0-68e6-4d81-a65e-580002f337f5", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "e22316d6-d724-20ff-1a17-275f161406e2", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - ], - dataType: "line", - id: "3b78e866-c4a3-4976-a422-c75373f67e26", - text: "CS100", - state: "closed", - iconCls: "cls-line", - }, - ], - }, - { - code: "1", - dataType: "voltage", - id: "2788d286-f372-4a2b-9488-127351fa2cd4", - text: "10kV", - state: "closed", - iconCls: "cls-voltage", - children: [ - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [ - { - companyId: "f7d966d1-f3d1-4802-946d-ad93e1ee1b9b", - children: [], - dataType: "tower", - checked: false, - id: "6c42f3c6-dc46-482e-a745-efa260cb14d5", - text: "TS202211161234001", - state: "open", - iconCls: "cls-tower", - device: [ - { - deviceId: "937ca5d8-ec2b-415b-9be2-99466d6f7d29", - deviceSN: null, - deviceType: null, - funcProp: null, - cameraType: null, - productCode: null, - manufacturerCode: null, - modelCode: null, - versionId: null, - deliveryNO: null, - deliveryDate: null, - expirationDate: null, - installDate: null, - companyId: null, - locationId: "4220a1ec-1697-7ef2-e4d0-f382f4e51620", - status: null, - createUserId: null, - createTime: null, - updateUserId: null, - updateTime: null, - collectConfigId: null, - deliveryYear: null, - isReportGps: 0, - pictureQuality: null, - audioRuleId: null, - analyseVersion: null, - modelVersion: null, - passwd: null, - towerId: null, - i1Version: null, - deviceIp: null, - analyseStatus: null, - analyseStartDate: null, - videoProtocol: null, - beidou: null, - connectWay: null, - gatewayId: null, - imsi: null, - imei: null, - imei2: null, - meid2: null, - puid: null, - simid: null, - meid: null, - }, - ], - }, - ], - dataType: "line", - id: "6258efae-6c92-4c87-b9b6-b3937e41ebce", - text: "规约调试", - state: "closed", - iconCls: "cls-line", - }, - ], - }, - ], - }, - ], - success: true, -}; - -export default getTowerLinePoint; diff --git a/src/utils/api/index.js b/src/utils/api/index.js index 7a8da67..e5b150c 100644 --- a/src/utils/api/index.js +++ b/src/utils/api/index.js @@ -140,6 +140,16 @@ export function getChannelListJoggle(data) { }); } +//拍照时间表设置 +//1.获取任务规则列表接口 +export function getScheduleRulelListJoggle(data) { + return request({ + url: "/test/getScheduleRulelList", + method: "post", + data, + }); +} + //线路信息管理接口数据 //1.线路列表信息 export function getLineListJoggle(data) { diff --git a/src/utils/request.js b/src/utils/request.js index 0fa18eb..31d23e9 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,36 +1,36 @@ import axios from "axios"; -import { Loading } from "element-ui"; //项目已经全局引入element的话可以不单独引入 -let loading; //定义loading变量 -function startLoading() { - //使用Element loading-start 方法 - loading = Loading.service({ - lock: true, - text: "加载中……", - background: "rgba(255, 255, 255, 0.7)", - }); -} -function endLoading() { - //使用Element loading-close 方法 - loading.close(); -} +// import { Loading } from "element-ui"; //项目已经全局引入element的话可以不单独引入 +// let loading; //定义loading变量 +// function startLoading() { +// //使用Element loading-start 方法 +// loading = Loading.service({ +// lock: true, +// text: "加载中……", +// background: "rgba(255, 255, 255, 0.7)", +// }); +// } +// function endLoading() { +// //使用Element loading-close 方法 +// loading.close(); +// } //那么 showFullScreenLoading() tryHideFullScreenLoading() 要干的事儿就是将同一时刻的请求合并。 //声明一个变量 needLoadingRequestCount，每次调用showFullScreenLoading方法 needLoadingRequestCount + 1。 //调用tryHideFullScreenLoading()方法，needLoadingRequestCount - 1。needLoadingRequestCount为 0 时，结束 loading。 -let needLoadingRequestCount = 0; -export function showFullScreenLoading() { - if (needLoadingRequestCount === 0) { - startLoading(); - } - needLoadingRequestCount++; -} +// let needLoadingRequestCount = 0; +// export function showFullScreenLoading() { +// if (needLoadingRequestCount === 0) { +// startLoading(); +// } +// needLoadingRequestCount++; +// } -export function tryHideFullScreenLoading() { - if (needLoadingRequestCount <= 0) return; - needLoadingRequestCount--; - if (needLoadingRequestCount === 0) { - endLoading(); - } -} +// export function tryHideFullScreenLoading() { +// if (needLoadingRequestCount <= 0) return; +// needLoadingRequestCount--; +// if (needLoadingRequestCount === 0) { +// endLoading(); +// } +// } const service = axios.create({ // process.env.NODE_ENV === 'development' 来判断是否开发环境 @@ -43,7 +43,7 @@ const service = axios.create({ service.interceptors.request.use( (config) => { - showFullScreenLoading(); + //showFullScreenLoading(); return config; }, (error) => { @@ -55,7 +55,7 @@ service.interceptors.request.use( service.interceptors.response.use( (response) => { if (response.status === 200) { - tryHideFullScreenLoading(); + // tryHideFullScreenLoading(); return response.data; } else { Promise.reject(); diff --git a/src/views/Login.vue b/src/views/Login.vue index f0849be..166fe8f 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -1,39 +1,41 @@ @@ -91,55 +93,66 @@ export default { height: 100%; background: url(../assets/img/loginbg.jpeg) no-repeat center center; background-size: cover; - .ms-login { - position: absolute; - width: 420px; - height: 454px; - left: 50%; - top: 50%; - transform: translate(-50%;-50%); - border-radius: 5px; - background: url(../assets/img/loginBackImage.8b77ab2c.png) no-repeat; - // -webkit-backdrop-filter: blur(5px); - // backdrop-filter: blur(15px); - overflow: hidden; - background-size: 100%; - .ms-title { - text-align: center; - border-bottom: 1px solid @border-color-base; - padding: 40px 16px; + backdrop-filter: blur(15px); + -webkit-backdrop-filter: blur(5px); + overflow: hidden; + .loginFilter { + height: 100%; + width: 100%; + filter: drop-shadow(0px 20px 10px rgba(0, 0, 0, 0.5)); + display: flex; + justify-content: center; + align-items: center; + .ms-login { + position: absolute; + width: 420px; + height: 454px; + left: 50%; + top: 50%; + transform: translate(-50%;-50%); + border-radius: 5px; + background: url(../assets/img/loginBackImage.8b77ab2c.png) no-repeat; + // -webkit-backdrop-filter: blur(5px); + // backdrop-filter: blur(15px); + overflow: hidden; + background-size: 100%; + .ms-title { + text-align: center; + border-bottom: 1px solid @border-color-base; + padding: 40px 16px; - img { - margin-bottom: 8px; - width: 160px; - } - h3 { - font-size: 30px; - background: linear-gradient(0deg, #86b7ff, #4293fd 99.46289%); - background-clip: text; - -webkit-text-fill-color: transparent; - // font-weight: normal; - } - } - .ms-content { - padding: 40px 40px; - .el-form-item { - margin-bottom: 30px; + img { + margin-bottom: 8px; + width: 160px; + } + h3 { + font-size: 30px; + background: linear-gradient(0deg, #86b7ff, #4293fd 99.46289%); + background-clip: text; + -webkit-text-fill-color: transparent; + // font-weight: normal; + } } - .login-btn { - text-align: center; - button { - width: 100%; - height: 36px; - margin-bottom: 10px; + .ms-content { + padding: 40px 40px; + .el-form-item { + margin-bottom: 30px; + } + .login-btn { + text-align: center; + button { + width: 100%; + height: 36px; + margin-bottom: 10px; + } } } + // .login-tips { + // font-size: 12px; + // line-height: 30px; + // color: @color-white; + // } } - // .login-tips { - // font-size: 12px; - // line-height: 30px; - // color: @color-white; - // } } } diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index 8f72e92..04dcc23 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -6,11 +6,7 @@ :options="swiperOptionTop" ref="swiperTop" > - +
-

{{ item.photoTime }}

+

+ {{ $moment(item.photoTime).format("YYYY-MM-DD HH:mm:ss") }} +

-
+ >
--> @@ -69,32 +66,32 @@ export default { data() { return { //轮播大图配置 - // bigImg: [ - // { - // url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/210509/XYIGQ10C221000080_21050918190300_1_255.jpg", - // id: 0, - // }, - // { - // url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323100012_1_255_res.jpg", - // id: 1, - // }, - // { - // url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323090012_1_255_res.jpg", - // id: 2, - // }, - // { - // url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323080011_1_255_res.jpg", - // id: 3, - // }, - // { - // url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323070012_1_255_res.jpg", - // id: 4, - // }, - // { - // url: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323060012_1_255_res.jpg", - // id: 5, - // }, - // ], + bigImg: [ + { + path: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/210509/XYIGQ10C221000080_21050918190300_1_255.jpg", + id: 0, + }, + { + path: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323100012_1_255_res.jpg", + id: 1, + }, + { + path: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323090012_1_255_res.jpg", + id: 2, + }, + { + path: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323080011_1_255_res.jpg", + id: 3, + }, + { + path: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323070012_1_255_res.jpg", + id: 4, + }, + { + path: "http://180.166.218.222:8104/media/local/XYIGQ10C221000080/202303/XYIGQ10C221000080_20230323060012_1_255_res.jpg", + id: 5, + }, + ], swiperOptionTop: { zoom: true, loop: true, @@ -102,9 +99,10 @@ export default { spaceBetween: 10, observer: true, //修改swiper自己或子元素时，自动初始化swiper observeParents: true, //修改swiper的父元素时，自动初始化swiper - // autoplay: { //自动轮播 + // autoplay: { + // //自动轮播 // delay: 2000, - // disableOnInteraction: false + // disableOnInteraction: false, // }, navigation: { nextEl: ".swiper-button-next", @@ -136,6 +134,9 @@ export default { display: flex; flex-direction: column; height: 100%; + .slide { + width: 20%; + } .gallery-top { // height: 80% !important; height: 80% !important; @@ -148,6 +149,7 @@ export default { width: 100%; margin-left: 2px; background-color: #f0f0f8; + .swiper-button-next { right: 0px; } @@ -167,6 +169,7 @@ export default { .swiper-slide { background-size: cover; background-position: center; + //border: 3px solid transparent; } .gallery-thumbs .swiper-slide { @@ -174,6 +177,9 @@ export default { // height: 80px; // opacity: 0.4; } + .slide { + border: 3px solid transparent; + } .gallery-thumbs .swiper-slide-active { border: 3px solid @color-primary; } diff --git a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue new file mode 100644 index 0000000..2802e7f --- /dev/null +++ b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue @@ -0,0 +1,152 @@ + + diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue new file mode 100644 index 0000000..de94fc7 --- /dev/null +++ b/src/views/devicePhotoSchedule/index.vue @@ -0,0 +1,228 @@ + + + diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue index 961f17d..7ffb24c 100644 --- a/src/views/realTimeMonitor/index.vue +++ b/src/views/realTimeMonitor/index.vue @@ -15,6 +15,16 @@ @node-click="handleNodeClick" :current-node-key="currentNodekey" > + + + + + {{ node.label }} + @@ -24,11 +34,6 @@
- -
@@ -149,7 +154,7 @@ export default { getTerminalPhotoListJoggle({ channelid: id, pageindex: 1, - pagesize: 1, + pagesize: 100, terminalid: termId, }) .then((res) => { @@ -185,12 +190,6 @@ export default { \ No newline at end of file + diff --git a/vue.config.js b/vue.config.js index 1905abc..495ab57 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,8 +1,10 @@ const { defineConfig } = require("@vue/cli-service"); const path = require("path"); module.exports = defineConfig({ - publicPath: "/", - assetsDir: "static", + productionSourceMap: false, // 生产环境是否要生成 sourceMap + publicPath: process.env.PUBLIC_PATH ? process.env.PUBLIC_PATH : "./", // 部署应用包时的基本 URL + outputDir: "dist", // 打包时输出的文件目录 + assetsDir: "static", // 放置静态文件夹目录 transpileDependencies: true, lintOnSave: false, pluginOptions: { @@ -14,17 +16,16 @@ module.exports = defineConfig({ ], }, }, - devServer: { proxy: { - "/api": { + [process.env.VUE_APP_BASE_API]: { //表示拦截以/api开头的请求路径 //target: 'http://localhost:1234', //本地nodejs服务器 target: "http://47.96.238.157:8093", //公司项目服务器环境 //target: 'http://180.166.218.222:7200', changOrigin: true, //是否开启跨域 pathRewrite: { - "^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的 + ["^" + process.env.VUE_APP_BASE_API]: "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的 }, }, },