diff --git a/dist.zip b/dist.zip index 92235996..b5e616a7 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/public/js/config.js b/public/js/config.js index 93f5448a..9210af6b 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -18,7 +18,7 @@ var PROJECT = { } -var PROJECT_TYPE = PROJECT.online_zjsj +var PROJECT_TYPE = PROJECT.local_test var headerShow = true; // 是否显示头部 var tabsShow = true; // 是否显示tabs diff --git a/src/components/videoModule/playBack/playBack.vue b/src/components/videoModule/playBack/playBack.vue index caa0e06c..0fb9f2e6 100644 --- a/src/components/videoModule/playBack/playBack.vue +++ b/src/components/videoModule/playBack/playBack.vue @@ -46,8 +46,8 @@ export default { data() { return { videoType:"", - startTime: new Date(), - endTime:new Date(), + startTime: '', + endTime:'', locationValue:1, //声明公用变量 initCount: 0, @@ -74,6 +74,16 @@ export default { this.initparam.apiIp = this.devList[0].account this.initparam.apiPort = this.devList[0].password this.pointCode = this.devList[0].serialNumber + + // 时间处理 + //设置录像回放时间的默认值 + this.endTime = this.dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss"); + this.startTime = this.dateFormat(new Date(), "yyyy-MM-dd 00:00:00"); + + console.log('当前时间默认', endTime) + console.log('当前时间', startTime) + + // console.log('拿到的对象',this.initparam) //调用电脑中的插件 this.WebControl = WebControl; @@ -83,7 +93,7 @@ export default { devList: function(newVal, oldVal) { console.log('新的值',newVal) this.pointCode = newVal[0].serialNumber; - this.startpreview(); + this.startPlayback(); } }, mounted() { @@ -368,6 +378,30 @@ export default { }) }, + + + // 格式化时间 + dateFormat(oDate, fmt) { + var o = { + "M+": oDate.getMonth() + 1, //月份 + "d+": oDate.getDate(), //日 + "h+": oDate.getHours(), //小时 + "m+": oDate.getMinutes(), //分 + "s+": oDate.getSeconds(), //秒 + "q+": Math.floor((oDate.getMonth() + 3) / 3), //季度 + "S": oDate.getMilliseconds()//毫秒 + }; + if (/(y+)/.test(fmt)) { + fmt = fmt.replace(RegExp.$1, (oDate.getFullYear() + "").substr(4 - RegExp.$1.length)); + } + for (var k in o) { + if (new RegExp("(" + k + ")").test(fmt)) { + fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length))); + } + } + return fmt; + }, + //关闭视频窗口 closeWindow() { diff --git a/src/components/videoModule/videoModule.less b/src/components/videoModule/videoModule.less index ce8fd4ee..f4efde8c 100644 --- a/src/components/videoModule/videoModule.less +++ b/src/components/videoModule/videoModule.less @@ -128,16 +128,18 @@ width: 60px; text-align: center; line-height: 34px; - color: #ffffff; + color: #fff; font-size: 15px; margin-right: 17px; // background-color: rgba(47, 187, 236, 0.3); + border: 1px solid #fff; display: inline-block; cursor: pointer; &.active{ - background-color: #2FBBEC; + color: #0EF6F8; + // background-color: #fff; + border: 1px solid #0EF6F8; } - background-color: red; } .operateBar{ i{ diff --git a/src/views/projectAdmin/fourEngin/command/leftThree.vue b/src/views/projectAdmin/fourEngin/command/leftThree.vue index 1b3f11ee..4c43bf56 100644 --- a/src/views/projectAdmin/fourEngin/command/leftThree.vue +++ b/src/views/projectAdmin/fourEngin/command/leftThree.vue @@ -78,10 +78,10 @@ export default { } }, created() { - this.getList() + // this.getList() }, methods: { - getList() {}, + // getList() {}, } } diff --git a/src/views/projectAdmin/fourEngin/progress/index.vue b/src/views/projectAdmin/fourEngin/progress/index.vue index 77dfeea1..7c845168 100644 --- a/src/views/projectAdmin/fourEngin/progress/index.vue +++ b/src/views/projectAdmin/fourEngin/progress/index.vue @@ -67,15 +67,15 @@ export default { numberOfCompleted: 2, // 步骤条 progress: [ - { date: '2022-01-01', name: '基础工程', state: true ,}, - { date: '2022-02-14', name: '主题结构施工', state: true, }, - { date: '2022-03-25', name: '屋面工程', state: true, }, - { date: '2022-07-31', name: '机械设备安拆工程', state: true, }, - { date: '2022-08-31', name: '室内装饰装修工程', state: true,}, - { date: '2022-09-01', name: '基础工程', state: true ,}, - { date: '2022-10-14', name: '主题结构施工', state: true, }, - { date: '2022-11-25', name: '屋面工程', state: true,}, - { date: '2022-12-31', name: '机械设备安拆工程'}, + // { date: '2022-01-01', name: '基础工程', state: true ,}, + // { date: '2022-02-14', name: '主题结构施工', state: true, }, + // { date: '2022-03-25', name: '屋面工程', state: true, }, + // { date: '2022-07-31', name: '机械设备安拆工程', state: true, }, + // { date: '2022-08-31', name: '室内装饰装修工程', state: true,}, + // { date: '2022-09-01', name: '基础工程', state: true ,}, + // { date: '2022-10-14', name: '主题结构施工', state: true, }, + // { date: '2022-11-25', name: '屋面工程', state: true,}, + // { date: '2022-12-31', name: '机械设备安拆工程'}, ], // 设备列表 options: [], @@ -90,7 +90,7 @@ export default { }; }, created() { - // this.getList(); + this.getList(); }, computed: { ...mapState(["projectSn"]), @@ -105,25 +105,25 @@ export default { projectSn: this.projectSn, isNoStart: false, }).then((res) => { - // console.log("查询步骤条列表: ", res); + console.log("查询步骤条列表: ", res); // state 0未开始, 1进行中, 2已完成 - // const progress = this.progress; - // res.result.forEach((item) => { - // if (item.state == 2) { - // progress.push({ - // name: item.subitemProjectName, - // date: item.actualEndTime, - // }); - // this.numberOfCompleted++; - // console.log("this.numberOfCompleted: ", this.numberOfCompleted); - // } else { - // progress.push({ - // name: item.subitemProjectName, - // date: item.startTime, - // }); - // } - // }); - // console.log(this.progress); + const progress = this.progress; + res.result.forEach((item) => { + if (item.state == 2) { + progress.push({ + name: item.subitemProjectName, + date: item.actualEndTime, + }); + this.numberOfCompleted++; + console.log("this.numberOfCompleted: ", this.numberOfCompleted); + } else { + progress.push({ + name: item.subitemProjectName, + date: item.startTime, + }); + } + }); + console.log(this.progress); }); }, }, @@ -246,39 +246,34 @@ export default { display: flex; flex-direction: column; align-items: center; - .progress-item-dot { - width: 10px; - height: 10px; - background-color: #fff; - border-radius: 50%; - - &::after { - content: ''; - position: absolute; - top: 4px; - transform: translateX(-99%); - display: block; - width: 200px; - height: 2px; - background: #fff; - } - - &.active { - &::after { - background: #6dc6d8; - } - } - &::before { content: ''; position: relative; z-index: 9; - display: block; - width: 10px; - height: 10px; + width: 8px; + height: 8px; background-color: #fff; + border: 1px solid #2de1fa; border-radius: 50%; } + &:not(:last-child)::after { + content: ''; + position: absolute; + top: 5px; + left: 50%; + bottom: calc(100% - 5px); + width: 100%; + height: 1px; + background-color: #ccc; + } + &.success::after { + background-color: #2de1fa; + } + .date { + margin: 4px 0; + font-size: 12px; + color: #ddd; + } } .info { @@ -330,7 +325,6 @@ export default { color: #fafbfa; } } -} ::v-deep .el-input__suffix { display: none; diff --git a/src/views/projectFront/lifter/liveDataTable.vue b/src/views/projectFront/lifter/liveDataTable.vue index 56134afe..30fb1639 100644 --- a/src/views/projectFront/lifter/liveDataTable.vue +++ b/src/views/projectFront/lifter/liveDataTable.vue @@ -440,11 +440,12 @@ export default { this.selectLifterCurrentData() }, exportExcel(){ + console.log('点击this.valueTime',this.valueTime) if(this.valueTime){ window.location.href = this.$http.defaults.baseURL + "xmgl/download/exporExcelTowerAlarm?projectSn=" + this.projectSn + - "&devSn=" + this.devSn + "&startTime=" + this.transformTimestamp2(this.valueTime[0]) + "&endTime=" + this.transformTimestamp2(this.valueTime[1]); + "&devSn=" + this.devSn + "&startTime=" + this.valueTime[0] + "&endTime=" + this.valueTime[1]; }else { window.location.href = this.$http.defaults.baseURL +