12 changed files with 59 additions and 32 deletions
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -102,6 +102,7 @@ export const DICT_TYPE = {
  ORDER_ORIGIN: 'order_Origin',
  ORDER_PRIORITY: 'order_priority',
  PACK_SPEC: 'pack_spec',
+  WORK_ORDER_STATUS: 'work_order_status',
  
  // ============== EQUIPMENT - 设备模块 =============
  MAINTAIN_TYPE: 'maintain_type',
--- a/src/views/energy/base/energyQuantityManual/index.vue
+++ b/src/views/energy/base/energyQuantityManual/index.vue
@@ -106,7 +106,7 @@ export default {
        },
        {
          type: 'datePicker',
-          label: '时间',
+          label: '抄表日期',
          dateType: 'daterange',
          format: 'yyyy-MM-dd',
          valueFormat: "timestamp",
--- a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
+++ b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
@@ -118,8 +118,8 @@ export default {
        type: '',
        plcParamId: '',
        limitType: '',
-        minValue: null,
-        maxValue: null
+        minValue: 0,
+        maxValue: 0
      },
      objIds: [],// 回显数组
      isEdit: false, //是否是编辑
@@ -239,7 +239,8 @@ export default {
              return false
            }
          }
-          // this.form.limitType = Number(this.form.limitType)
+          this.form.minValue = this.form.minValue || 0
+          this.form.maxValue = this.form.maxValue || 0
          if (this.isEdit) {
            // 编辑
            updateEnergyLimit({...this.form}).then((res) => {
--- a/src/views/group/base/groupClasses/components/groupClassAdd.vue
+++ b/src/views/group/base/groupClasses/components/groupClassAdd.vue
@@ -116,7 +116,16 @@ export default {
        getGroupClasses(id).then((res) => {
          if (res.code === 0) {
            this.form = res.data
-            this.form.disableTime = res.data.disableTime || ''
+            this.form.name = res.data.name
+            this.form.code = res.data.code
+            this.form.enableTime = res.data.enableTime
+            // this.form.disableTime = res.data.disableTime || null
+            this.$set(this.form, 'disableTime', res.data.disableTime || null)
+            this.form.startTime = res.data.startTime
+            this.form.endTime = res.data.endTime
+            this.form.daySpan = res.data.daySpan
+            this.form.remark = res.data.remark
+            console.log(this.form)
          }
        })
      } else {
--- a/src/views/order/base/orderManage/orderDetailData.vue
+++ b/src/views/order/base/orderManage/orderDetailData.vue
@@ -165,7 +165,7 @@ const tableProps1 = [
  {
    prop: 'status',
    label: '状态',
-    filter: publicFormatter('order_status')
+    filter: publicFormatter('work_order_status')
  },
  {
    prop: 'startProduceTime',
--- a/src/views/safetyEnvironmental/environmental/components/lineChart.vue
+++ b/src/views/safetyEnvironmental/environmental/components/lineChart.vue
@@ -68,7 +68,6 @@ export default {
        }
        obj.name = item
        obj.type = 'line'
-        obj.stack = 'Total'
        obj.symbol = 'none'
        obj.data = data
        seriesData.push(obj)
@@ -118,7 +117,7 @@ export default {
            }
          },
          grid: {
-            left: '3%',
+            left: '4%',
            right: '2%',
            bottom: '3%',
            containLabel: true
--- a/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
+++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
@@ -56,7 +56,7 @@ const tableProps = [
  },
  {
    prop: 'code',
-    label: '指示编码',
+    label: '指标编码',
    minWidth: 120
  },
  {
--- a/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue
+++ b/src/views/safetyEnvironmental/environmental/voc/vocManagement/index.vue
@@ -35,13 +35,14 @@
 import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
 import LineChart from './../../components/lineChart'
 import SearchArea from './../../components/searchArea'
+import moment from 'moment'
 export default {
  name: 'Voc',
  data(){
    return {
      realtimeList:[],
      queryParams:{
-        checkType: 1,
+        checkType: 3,
        timeDim: null,
        timeRange: []
      },
@@ -51,6 +52,9 @@ export default {
  components: { LineChart, SearchArea },
  mounted() {
    this.getMsg()
+    this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
+    this.queryParams.timeRange = [moment().startOf('day')+0, moment().endOf('day')-59*61*1000]
+    this.getTrend()
  },
  methods: {
    getMsg() {
@@ -59,19 +63,21 @@ export default {
        this.realtimeList = res.data || []
      })
    },
-    getTrend(params) {
-      console.log(params)
-      this.queryParams.timeDim = params.timeDim
-      this.queryParams.timeRange[0] = params.startTime
-      this.queryParams.timeRange[1] = params.endTime
+    getTrend() {
      environmentalCheckRealtimeTrend({...this.queryParams}).then(res => {
-        console.log(res)
        if (res.code === 0) {
          this.chartData = res.data
        } else {
          this.chartData = {}
        }
      })
+    },
+    submitClick(params) {
+      console.log(params)
+      this.queryParams.timeDim = params.timeDim
+      this.queryParams.timeRange[0] = params.startTime
+      this.queryParams.timeRange[1] = params.endTime
+      this.getTrend()
    }
  }
 }
--- a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
@@ -56,7 +56,7 @@ const tableProps = [
  },
  {
    prop: 'code',
-    label: '指示编码',
+    label: '指标编码',
    minWidth: 120
  },
  {
--- a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasManagement/index.vue
@@ -35,6 +35,7 @@
 import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
 import LineChart from './../../components/lineChart'
 import SearchArea from './../../components/searchArea'
+import moment from 'moment'
 export default {
  name: 'WasteGasManagement',
  data(){
@@ -51,6 +52,9 @@ export default {
  components: { LineChart, SearchArea },
  mounted() {
    this.getMsg()
+    this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
+    this.queryParams.timeRange = [moment().startOf('day')+0, moment().endOf('day')-59*61*1000]
+    this.getTrend()
  },
  methods: {
    getMsg() {
@@ -59,19 +63,21 @@ export default {
        this.realtimeList = res.data || []
      })
    },
-    getTrend(params) {
-      console.log(params)
-      this.queryParams.timeDim = params.timeDim
-      this.queryParams.timeRange[0] = params.startTime
-      this.queryParams.timeRange[1] = params.endTime
+    getTrend() {
      environmentalCheckRealtimeTrend({...this.queryParams}).then(res => {
-        console.log(res)
        if (res.code === 0) {
          this.chartData = res.data
        } else {
          this.chartData = {}
        }
      })
+    },
+    submitClick(params) {
+      console.log(params)
+      this.queryParams.timeDim = params.timeDim
+      this.queryParams.timeRange[0] = params.startTime
+      this.queryParams.timeRange[1] = params.endTime
+      this.getTrend()
    }
  }
 }
--- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
@@ -56,7 +56,7 @@ const tableProps = [
  },
  {
    prop: 'code',
-    label: '指示编码',
+    label: '指标编码',
    minWidth: 120
  },
  {
--- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterManagement/index.vue
@@ -22,7 +22,7 @@
        <span>检测指标趋势图</span>
      </div>
      <!-- 搜索工作栏 -->
-      <search-area @submit="getTrend"/>
+      <search-area @submit="submitClick"/>
      <line-chart :chartData="chartData" v-show='Object.keys(chartData).length !== 0' :timeDim="queryParams.timeDim"/>
      <!-- 没有数据 -->
      <div class="no-data-bg" v-show='Object.keys(chartData).length === 0'></div>
@@ -33,6 +33,7 @@
 import { environmentalCheckRealtime, environmentalCheckRealtimeTrend } from '@/api/safetyEnvironmental/environmental'
 import LineChart from './../../components/lineChart'
 import SearchArea from './../../components/searchArea'
+import moment from 'moment'
 export default {
  name: 'WasteWaterManagement',
  data(){
@@ -49,27 +50,31 @@ export default {
  components: { LineChart, SearchArea },
  mounted() {
    this.getMsg()
+    this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
+    this.queryParams.timeRange = [moment().startOf('day')+0, moment().endOf('day')-59*61*1000]
+    this.getTrend()
  },
  methods: {
    getMsg() {
      environmentalCheckRealtime({checkType: 1}).then(res => {
-        console.log(res)
        this.realtimeList = res.data || []
      })
    },
-    getTrend(params) {
-      console.log(params)
-      this.queryParams.timeDim = params.timeDim
-      this.queryParams.timeRange[0] = params.startTime
-      this.queryParams.timeRange[1] = params.endTime
+    getTrend() {
      environmentalCheckRealtimeTrend({...this.queryParams}).then(res => {
-        console.log(res)
        if (res.code === 0) {
          this.chartData = res.data
        } else {
          this.chartData = {}
        }
      })
+    },
+    submitClick(params) {
+      console.log(params)
+      this.queryParams.timeDim = params.timeDim
+      this.queryParams.timeRange[0] = params.startTime
+      this.queryParams.timeRange[1] = params.endTime
+      this.getTrend()
    }
  }
 }