diff --git a/supervise-report-ui/src/main.js b/supervise-report-ui/src/main.js index f293ac64..208eaf65 100644 --- a/supervise-report-ui/src/main.js +++ b/supervise-report-ui/src/main.js @@ -50,7 +50,7 @@ VueAMap.initAMapApiLoader({ Vue.config.productionTip = false let token = null -// let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDA2MjAwNzF9.iAXRy8SKmeGqteP68u_MD32b1hG7pNsYoZQ3C-fgHSI' +// let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE3MDA2NDM3OTN9.a9Zmp99E33LC4fCVSwD5rDpiivzQCXRShw8p8voL4OQ' token = GetQueryString('token') if (token) { setStorage(token) diff --git a/supervise-report-ui/src/views/project/projectDaily.vue b/supervise-report-ui/src/views/project/projectDaily.vue index 4fba6a5c..189edc5d 100644 --- a/supervise-report-ui/src/views/project/projectDaily.vue +++ b/supervise-report-ui/src/views/project/projectDaily.vue @@ -258,7 +258,8 @@ import pageye from '@/components/pagination/pageye' import req from '@/api/project/projectDaily' import { - parseTime + parseTime, + getDateRang } from '@/utils/index' export default { name: 'DaydatauploadCash', @@ -272,15 +273,15 @@ banInfo: false, btndisabled: false, viewState: 1, // 1、列表 2、添加 3、修改 4、查看 - isSearchShow: false, - searchxianshitit: '显示查询条件', + isSearchShow: true, + searchxianshitit: '隐藏查询条件', queryParams: { current: 1, size: 10, total: 0, params: { - dataDateStart: '', - dataDateEnd: '', + dataDateStart: getDateRang('yesterday'), + dataDateEnd: getDateRang('yesterday'), projectSid: '' } }, @@ -632,6 +633,8 @@ window.open('/map365/#/allData?projectSid=' + projectSid + '&projectName=' + projectName + '&orderDate=' + orderDate); + // window.open('http://192.168.0.117:9533/map365/#/allData?projectSid=' + projectSid + '&projectName=' + projectName + + // '&orderDate=' + orderDate); }, sendMess(row) { req.sendMess(row.projectSid, row.orderDate).then(res => { diff --git a/supervise-report-ui/src/views/reportCenter/thresholdAnalysis.vue b/supervise-report-ui/src/views/reportCenter/thresholdAnalysis.vue index d563d70b..9b8397ee 100644 --- a/supervise-report-ui/src/views/reportCenter/thresholdAnalysis.vue +++ b/supervise-report-ui/src/views/reportCenter/thresholdAnalysis.vue @@ -11,7 +11,7 @@