Merge remote-tracking branch 'origin/master'

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)

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 => {

supervise-report-ui/src/views/reportCenter/thresholdAnalysis.vue

@@ -11,7 +11,7 @@
             <div v-show="isSearchShow" class="search">
               <el-form ref="queryParams" :model="queryParams" :inline="true" class="tab-header">
                 <el-form-item label="日期">
-                  <el-date-picker v-model="queryParams.date" type="date" clearable value-format="yyyy-MM-dd"
+                  <el-date-picker v-model="queryParams.params.date" type="date" clearable value-format="yyyy-MM-dd"
                     placeholder="选择日期" />
                 </el-form-item>
                 <el-form-item label="类别">
@@ -66,7 +66,9 @@
   import Pagination from '@/components/pagination'
   import pageye from '@/components/pagination/pageye'
   import * as echarts from 'echarts';
-
+ import {
+    getDateRang
+  } from '@/utils/index'
   export default {
     components: {
       ButtonBar,
@@ -78,8 +80,8 @@
       return {
         btndisabled: false,
         viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
+        isSearchShow: true,
+        searchxianshitit: '隐藏查询条件',
         tableLoading: false,
         tableKey: 0,
         // 类型1.全部,2.常规商品3.烟草
@@ -117,11 +119,11 @@
           total: 0,
           params: {
             customerSid: '',
-            date: this.getDate(),
+            date: getDateRang('yesterday'),
             type: '',
           } // 类别key
         },
-        nowDate: new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate(),
+        // nowDate: new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate(),
         thresholdAnalysisTable: [{
           num: '1',
           date: '2023-01-01',
@@ -435,7 +437,7 @@
 
       dosearch() {
 
-        this.nowDate = this.queryParams.date;
+         this.queryParams.date=getDateRang('yesterday'),
         this.loadList();
 
       },