排班及bug

src/views/energy/analysis/trendAnalysis/components/searchArea.vue

@@ -172,6 +172,7 @@ export default {
     this.getTypeList()
     this.getObjTree()
     this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
+    this.timeValue = [moment().startOf('day'), moment().endOf('day')-59*61*1000]
   },
   methods: {
     getTypeList() {
@@ -276,7 +277,7 @@ export default {
         this.$modal.msgError('请选择能源类型')
         return false
       }
-      if (!this.objArr.length === 0) {
+      if (this.objArr.length === 0) {
         this.$modal.msgError('请选择对象')
         return false
       } else {

src/views/energy/analysis/trendAnalysis/index.vue

@@ -37,16 +37,6 @@ export default {
           this.chartData = []
         }
       })
-      // getEnergyTrend({
-      //   energyTypeId: "1681183397517406210",
-      //   objId: "1679031282510532610",
-      //   timeDim: "2",
-      //   startTime: "1690732800000",
-      //   endTime: "1690992000000"
-      // }).then((res) => {
-      //   console.log(res)
-      //   this.chartData = res.data
-      // })
     },
     switchChart() {
       if (this.activeName === 'bar') {

src/views/energy/base/energyPlcConnect/index.vue

@@ -92,7 +92,7 @@ export default {
           type: 'input',
           label: '标识名',
           placeholder: '标识名',
-          param: 'name'
+          param: 'cnName'
         },
         {
           type: 'button',
@@ -149,7 +149,7 @@ export default {
       queryParams: {
         pageNo: 1,
         pageSize: 20,
-        name: null
+        cnName: null
       },
       paramVisible: false,
       energyTypeList: [],
@@ -173,7 +173,7 @@ export default {
       switch (val.btnName) {
         case 'search':
           this.queryParams.pageNo = 1;
-          this.queryParams.name = val.name
+          this.queryParams.cnName = val.cnName
           this.getList()
           break
         default:

src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue

@@ -47,7 +47,7 @@
       </el-select>
     </el-form-item>
     <el-form-item label="消耗量阈值" prop="limitValue">
-      <el-input v-model="form.limitValue"></el-input>
+      <el-input-number v-model="form.limitValue" :min="0" :max="10000000000000000" style="width: 100%;"></el-input-number>
     </el-form-item>
   </el-form>
 </template>

src/views/energy/monitoring/energyReportSearch/index.vue

@@ -118,16 +118,16 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
     })
-    this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
+    if (this.$route.params.startTime && this.$route.params.endTime) {
+      this.formConfig[2].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime]
+    } else {
+      this.formConfig[2].defaultSelect = [Date.now() - 7*24*3600000, Date.now()]
+    }
     this.queryParams.startTime = this.formConfig[2].defaultSelect[0]
     this.queryParams.endTime = this.formConfig[2].defaultSelect[1]
     this.getList()
     this.getTypeList()
   },
-  mounted() {
-    console.log(this.$route.params.name)
-    console.log('22222')
-  },
   methods: {
     getTypeList() {
       getEnergyTypeListAll().then((res) => {

src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue

@@ -75,7 +75,7 @@ export default {
         {
           type: 'input',
           label: '参数名称',
-          placeholder: '方案名称',
+          placeholder: '参数名称',
           param: 'paramName'
         },
         {