Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/views/safetyManagement/equipmentInspectionTask/index.vue

@@ -244,7 +244,17 @@ export default {
     // 加载页面数据
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+      const requestParams = Object.assign({}, params, this.query);
+      // 后端要字符串类型
+      if (requestParams.queryLaunchTime && Array.isArray(requestParams.queryLaunchTime)) {
+
+        requestParams.queryLaunchTime = requestParams.queryLaunchTime.join(',');
+      }
+      if (requestParams.queryTestTime && Array.isArray(requestParams.queryTestTime)) {
+
+        requestParams.queryTestTime = requestParams.queryTestTime.join(',');
+      }
+      getList(page.currentPage, page.pageSize, requestParams).then(
         (res) => {
           this.data = res.data.data.records;
           this.loading = false;

src/views/safetyManagement/safetyInspectionTask/index.vue

@@ -209,9 +209,17 @@ export default {
     // 加载页面数据
     onLoad(page, params = {}) {
       this.loading = true;
-      console.log("params", params)
-      console.log("this.query", this.query)
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+      const requestParams = Object.assign({}, params, this.query);
+      // 后端要字符串类型
+      if (requestParams.queryLaunchTime && Array.isArray(requestParams.queryLaunchTime)) {
+
+        requestParams.queryLaunchTime = requestParams.queryLaunchTime.join(',');
+      }
+      if (requestParams.queryTestTime && Array.isArray(requestParams.queryTestTime)) {
+
+        requestParams.queryTestTime = requestParams.queryTestTime.join(',');
+      }
+      getList(page.currentPage, page.pageSize, requestParams).then(
         (res) => {
           this.data = res.data.data.records;
           this.loading = false;

src/views/safetyManagement/wasteGasSet/components/alarmRecord.vue

@@ -280,7 +280,13 @@ export default {
       this.$refs.table.clearSelection();
     },
     onLoad(page, params = {}) {
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query))
+      const requestParams = Object.assign({}, params, this.query);
+      // 后端要字符串类型
+      if (requestParams.queryBtDate && Array.isArray(requestParams.queryBtDate)) {
+
+        requestParams.queryBtDate = requestParams.queryBtDate.join(',');
+      }
+      getList(page.currentPage, page.pageSize, requestParams)
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;

src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue

@@ -367,7 +367,13 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       this.query = { ...this.query, dorType: 1 } //类型：1、废气加药；2、废水加药
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query))
+      const requestParams = Object.assign({}, params, this.query);
+      // 后端要字符串类型
+      if (requestParams.queryDosingTime && Array.isArray(requestParams.queryDosingTime)) {
+
+        requestParams.queryDosingTime = requestParams.queryDosingTime.join(',');
+      }
+      getList(page.currentPage, page.pageSize, requestParams)
         .then(res => {
           // this.data = [
           //   {

src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue

@@ -553,7 +553,17 @@ export default {
     // 加载页面数据
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query))
+      const requestParams = Object.assign({}, params, this.query);
+      // 后端要字符串类型
+      if (requestParams.queryStartTime && Array.isArray(requestParams.queryStartTime)) {
+
+        requestParams.queryStartTime = requestParams.queryStartTime.join(',');
+      }
+      if (requestParams.queryEndTime && Array.isArray(requestParams.queryEndTime)) {
+
+        requestParams.queryEndTime = requestParams.queryEndTime.join(',');
+      }
+      getList(page.currentPage, page.pageSize, requestParams)
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;

src/views/safetyManagement/wastewater/components/dischargeRec.vue

@@ -323,7 +323,13 @@ export default {
     // 加载页面数据
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query))
+      const requestParams = Object.assign({}, params, this.query);
+      // 后端要字符串类型
+      if (requestParams.queryDirDate && Array.isArray(requestParams.queryDirDate)) {
+
+        requestParams.queryDirDate = requestParams.queryDirDate.join(',');
+      }
+      getList(page.currentPage, page.pageSize, requestParams)
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;

src/views/safetyManagement/wastewater/components/dosingRecord.vue

@@ -325,8 +325,14 @@ export default {
     // 加载页面数据
     onLoad(page, params = {}) {
       this.loading = true;
-      this.query = {...this.query,dorType: 2}  //类型：1、废气加药；2、废水加药
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query))
+      this.query = { ...this.query, dorType: 2 }  //类型：1、废气加药；2、废水加药
+      const requestParams = Object.assign({}, params, this.query);
+      // 后端要字符串类型
+      if (requestParams.queryDosingTime && Array.isArray(requestParams.queryDosingTime)) {
+
+        requestParams.queryDosingTime = requestParams.queryDosingTime.join(',');
+      }
+      getList(page.currentPage, page.pageSize, Object.assign(params, requestParams))
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;

src/views/safetyManagement/wastewater/components/testRecord.vue

@@ -130,15 +130,34 @@ export default {
           },
           {
             label: '化验时间',
-            prop: 'dosingTime',
+            prop: 'queryDosingTime',
             search: true,
             searchLabelWidth: 80,
+            hide:true,
             sortable: true,
-            filter: true,
+            filter: true,  
+            editDisplay: false,
+            display: false,
             span: 12,
-            type: "datetime",
+            type: 'datetime',
+            searchRange: true,
+            startPlaceholder: "开始时间",
+            endPlaceholder: "结束时间",
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          },
+    
+          {
+            label: '化验时间',
+            prop: 'dosingTime',
+            search: false,
+      
+            sortable: true,
+            filter: true,
+            span: 12,
+            type: "datetime",
+            // format: 'YYYY-MM-DD HH:mm:ss',
+            // valueFormat: 'YYYY-MM-DD HH:mm:ss',
             rules: [
               {
                 required: true,
@@ -358,7 +377,12 @@ export default {
     // 加载页面数据
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query))
+      const requestParams = Object.assign({}, params, this.query);
+      // 后端要字符串类型
+      if (requestParams.queryDosingTime && Array.isArray(requestParams.queryDosingTime)) {
+        requestParams.queryDosingTime = requestParams.queryDosingTime.join(',');
+      }
+      getList(page.currentPage, page.pageSize, requestParams)
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;