diff --git a/src/subpackage/blacklist/pages/abnormal_list/abnormal_list.vue b/src/subpackage/blacklist/pages/abnormal_list/abnormal_list.vue index 9b6ae9e..9e30f69 100644 --- a/src/subpackage/blacklist/pages/abnormal_list/abnormal_list.vue +++ b/src/subpackage/blacklist/pages/abnormal_list/abnormal_list.vue @@ -12,13 +12,20 @@ + + + {{ curTimeTab.name || '-' }} + + + - 核销日期:{{ curDate || '' }} + {{ curDate || '' }} + {{ e.extension.stadium_name || '-' }} @@ -39,6 +46,9 @@ 核销时间:{{ e.verify_time || '-' }} + 抓拍时间:{{ e.img_time || '-' }} + + 抓拍图片: img_time + * 核销日期 -> 抓拍日期 + * 新增 抓拍时间 + * + * 20231130 + * 新增核销日期和拍照日期切换 + * + * */ +let _timeTabs = [ { name: '抓拍日期', label: 'img_time' }, { name: '核销日期', label: 'verify_time' }, ]; export default { data(){ return { + timeTabs: _timeTabs, stadiumLs: [], selectStadium: {}, curDate: '', blackLs: [], - page: 1 + page: 1, + curTimeTab: _timeTabs[0] || {}, } }, async onLoad(options){ try{ let _date = this.curDate = util.formatDate({}); let _stadiumLs = await this.getStoreList({}); + let { curTimeTab } = this; this.getRecords({ brand_id: options.brand_id, - verify_time: _date + [ curTimeTab?.label || '-' ]: _date }); }catch(err){ console.warn('get records ls err --->', err); } }, onReachBottom(){ - let { selectStadium, curDate, page } = this; + let { selectStadium, curDate, page, curTimeTab } = this; this.getRecords({ brand_id: selectStadium.brand_id, stadium_id: selectStadium.id, - verify_time: curDate, + [ curTimeTab?.label || '-' ]: curDate, page: ++page }) }, methods: { + timeTabChange(e){ + let { value } = e.detail || {}; + let { timeTabs, curDate, selectStadium } = this; + this.blackLs = []; + this.page = 1; + this.curTimeTab = timeTabs[value] || {}; + this.getRecords({ + brand_id: selectStadium.brand_id, + stadium_id: selectStadium.id, + [ timeTabs[value]?.label || '-' ]: curDate, + }) + + }, previewImg(url){ uni.previewImage({ urls: [url] }); }, @@ -105,15 +144,19 @@ export default { stadium_id = '', page = 1, page_size = 10, - verify_time = '' + verify_time = '', + img_time = '', }){ util.showLoad(); - server.get({ + let _qry = { + authority, brand_id, page, page_size, + stadium_id: stadium_id || '' + } + if(img_time)_qry['img_time'] = img_time; + if(verify_time)_qry['verify_time'] = verify_time; + server.post({ url: BLACKLIST_API.identifyRecords, - data: { - authority, brand_id, page, page_size, - stadium_id: stadium_id || '', verify_time - }, + data: _qry, failMsg: '加载列表失败!' }) .then(res => { @@ -127,7 +170,7 @@ export default { }) }, dateChange(e){ - let { selectStadium } = this; + let { selectStadium, curTimeTab } = this; let _date = e.detail.value || '-' this.curDate = _date; this.page = 1; @@ -135,11 +178,11 @@ export default { this.getRecords({ brand_id: selectStadium.brand_id, stadium_id: selectStadium.id, - verify_time: _date, + [ curTimeTab?.label || '-' ]: _date, }) }, stadiumChange(e){ - let { stadiumLs, curDate } = this; + let { stadiumLs, curDate, curTimeTab } = this; let _curStadium = stadiumLs[e.detail.value] || {}; this.selectStadium = _curStadium; this.page = 1; @@ -147,7 +190,7 @@ export default { this.getRecords({ brand_id: _curStadium.brand_id, stadium_id: _curStadium.id, - verify_time: curDate, + [ curTimeTab?.label || '-' ]: curDate, }) }, operateBtn(e, idx){ @@ -270,6 +313,13 @@ export default { } .al-date{ padding: 0 24upx; + @include centerFlex(flex-start); + .ad-name{ + line-height: 44upx; + font-weight: 500; + font-size: 32upx; + color: #1a1a1a; + } .ad-content{ @include centerFlex(flex-start); .ac-txt{ @@ -279,6 +329,7 @@ export default { color: #1a1a1a; } .ac-icon{ + margin-right: 14upx; flex-grow: 0; flex-shrink: 0; margin-left: 16upx; diff --git a/src/subpackage/device/js/device_fun.js b/src/subpackage/device/js/device_fun.js index 27a8fdc..8d96b28 100644 --- a/src/subpackage/device/js/device_fun.js +++ b/src/subpackage/device/js/device_fun.js @@ -11,12 +11,12 @@ var DEVICE_FUN = { 场景: 目前需求只要求照明(中控状态更新,灯操控) 其它需要再对接 注意: 涉及deviceApi.ouxuanac 接口的,理论上来说都需要做兼容去在逻辑中传入硬件信息判断是否是云中控 */ - AC_filterCloudACData(data,switchInfo){ - console.log("云中控参数检测 AC_filterCloudACData",data,switchInfo); + AC_filterCloudACData(data, switchInfo){ + console.log("云中控参数检测 AC_filterCloudACData", data, switchInfo); //处理云中控专用参数 // 这里device是设备名 一旦出现云中控 设备id被 (OUXUANAC_CLOUD_+hardware_net_addr) 串起来的字符串覆盖 - if(!!switchInfo&&switchInfo.hardware_connect_method=="YZK"){ - data.device = "OUXUANAC_CLOUD_"+switchInfo.hardware_net_addr; + if(switchInfo?.hardware_connect_method=="YZK"){ + data.device = "OUXUANAC_CLOUD_" + switchInfo.hardware_net_addr; } return data diff --git a/src/subpackage/device/pages/audio_manage/audio_manage.vue b/src/subpackage/device/pages/audio_manage/audio_manage.vue index d2a509b..1fd24bd 100644 --- a/src/subpackage/device/pages/audio_manage/audio_manage.vue +++ b/src/subpackage/device/pages/audio_manage/audio_manage.vue @@ -45,18 +45,6 @@ - @@ -90,6 +78,13 @@