页面调整

src/pages/analysis/energy/page.vue

@@ -8,7 +8,7 @@
       </div>
       <div slot="content" style="height: calc(100% - 70px)">
         <div>
-          <el-tabs class="en-tabs" v-model="activetap">
+          <el-tabs class="en-tabs" v-model="activetap" @tab-click="tabClick">
             <el-tab-pane
               :label="item.label"
               :name="item.value"
@@ -20,26 +20,32 @@
         <div>
           <el-form :inline="true" size="mini" style="padding-top: 15px">
             <el-form-item label="时间范围：">
-                <el-date-picker
-                  v-model="startTime"
-                  align="right"
-                  type="date"
-                  placeholder="选择日期"
-                >
-                </el-date-picker>
-                <span style="padding: 0 10px">至</span>
-                <el-date-picker
-                  v-model="endTime"
-                  align="right"
-                  type="date"
-                  placeholder="选择日期"
-                >
-                </el-date-picker>
-              </el-form-item>
-
-              <el-button type="primary" size="mini" icon="el-icon-search"
-                >查询</el-button
+              <el-date-picker
+                v-model="startTime"
+                align="right"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+              >
+              </el-date-picker>
+              <span style="padding: 0 10px">至</span>
+              <el-date-picker
+                v-model="endTime"
+                align="right"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
               >
+              </el-date-picker>
+            </el-form-item>
+
+            <el-button
+              type="primary"
+              size="mini"
+              icon="el-icon-search"
+              @click="getDataList()"
+              >查询</el-button
+            >
             <!-- <el-form-item label="时间范围：">
               <el-button
                 size="mini"
@@ -122,22 +128,24 @@ export default {
       ]
     }
   },
-  watch: {
-    activetap() {
-      this.getDataList()
-    }
-  },
   mounted() {
     this.getDataList()
   },
   methods: {
+    tabClick(tab, event) {
+      // console.log(tab, event)
+      this.startTime = ''
+      this.endTime = ''
+      this.getDataList()
+    },
     getDataList() {
       this.$http({
         url: this.$http.adornUrl('/analysis/getEnergyFx'),
         method: 'get',
         params: this.$http.adornParams({
           resourceType: this.activetap, //资源点类型
-          type: this.currentActive
+          startTime: this.startTime,
+          endTime: this.endTime
         })
       }).then((data) => {
         if (data && data.code === 0) {

src/pages/analysis/fault/index.vue

@@ -16,14 +16,16 @@ card-warp(title="故障报警分析", height="45px", showBackground)
           v-model="startTime"
           align="right"
           type="date"
+          value-format="yyyy-MM-dd"
           placeholder="选择日期")
         span( style="padding: 0 10px") 至
         el-date-picker(
           v-model="endTime"
           align="right"
           type="date"
+          value-format="yyyy-MM-dd"
           placeholder="选择日期")
-        el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search") 查询
+        el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search" @click="getDataList()") 查询
 
     .echartsWarp(width="100%", flex)
       div
@@ -44,6 +46,8 @@ export default {
   },
   data() {
     return {
+      startTime: '',
+      endTime: '',
       dateTypeList: [
         { name: '当日', id: 1 },
         { name: '本周', id: 2 },
@@ -65,7 +69,8 @@ export default {
         url: this.$http.adornUrl('/analysis/getFaultAlarmList'),
         method: 'get',
         params: this.$http.adornParams({
-          type: this.currentActive
+          startTime: this.startTime,
+          endTime: this.endTime
         })
       }).then((data) => {
         if (data && data.code === 0) {
@@ -73,7 +78,7 @@ export default {
           console.log('数据2', data.idList)
           this.typeList = data.typeList
           this.idList = data.idList
-          this.legendData = this.idList.filter(e => e.name)
+          this.legendData = this.idList.filter((e) => e.name)
         }
       })
     },

src/pages/analysis/indoor/index.vue

@@ -24,14 +24,16 @@ card-warp(title="室内气象分析", height="45px")
           v-model="startTime"
           align="right"
           type="date"
+          value-format="yyyy-MM-dd"
           placeholder="选择日期")
         span( style="padding: 0 10px") 至
         el-date-picker(
           v-model="endTime"
           align="right"
           type="date"
+          value-format="yyyy-MM-dd"
           placeholder="选择日期")
-        el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search") 查询
+        el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search" @click="getDataList()") 查询
     .echartsWarp(width="100%", flex)
       div(v-for='item in chartList' :key='item.id')
         chart(:id="item.id", :data="item.data", :title="item.title", :color="item.color")
@@ -69,6 +71,8 @@ export default {
   methods: {
     tabClick(tab, event) {
       // console.log(tab, event)
+      this.startTime = ''
+      this.endTime = ''
       this.getDataList()
     },
     getDataList() {
@@ -78,7 +82,8 @@ export default {
         params: this.$http.adornParams({
           resourceId: '',
           region: Number(this.activeName), //区域类型
-          type: this.currentActive
+          startTime: this.startTime,
+          endTime: this.endTime
         })
       }).then((data) => {
         if (data && data.code === 0) {

src/pages/analysis/outdoor/index.vue

@@ -19,13 +19,15 @@ card-warp(title="室外气象分析", height="45px", showBackground)
         el-date-picker(
           v-model="startTime"
           type="date"
+          value-format="yyyy-MM-dd"
           placeholder="开始日期")
         span  至 
         el-date-picker(
           v-model="endTime"
           type="date"
+          value-format="yyyy-MM-dd"
           placeholder="结束日期")
-
+      el-button(type="primary" size="mini" icon="el-icon-search" @click="getDataList()") 查询
     .echartsWarp(width="100%", flex)
       div(v-for='item in chartList' :key='item.id')
         chart(:id="item.id", :data="item.data", :title="item.title", :color="item.color")
@@ -72,7 +74,8 @@ export default {
         url: this.$http.adornUrl('/analysis/getSwqxzInfoTj'),
         method: 'get',
         params: this.$http.adornParams({
-          type: this.currentActive
+          startTime: this.startTime,
+          endTime: this.endTime
         })
       }).then((data) => {
         if (data && data.code === 0) {

src/pages/kb/indoor/history.vue

@@ -19,14 +19,16 @@
             v-model="startTime"
             align="right"
             type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择日期")
           span( style="padding: 0 10px") 至
           el-date-picker(
             v-model="endTime"
             align="right"
             type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择日期")
-          el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search") 查询
+          el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search"  @click="getList()") 查询
     span(v-if="type==1")
         el-table( :data='dataList'  size="mini" ,style='width: 100%;' :header-cell-style="{ background: '#EEF8FF', color: '#333333' }")
             el-table-column( :resizable="false" type='index', header-align='center', align='center', label='序号')
@@ -83,6 +85,8 @@ export default {
 
   methods: {
     init(data, type) {
+      this.startTime = ''
+      this.endTime = ''
       this.dataForm = data
       this.type = type
       this.visible = true
@@ -93,6 +97,13 @@ export default {
         this.getDataListTb()
       }
     },
+    getList() {
+      if (this.type === 1) {
+        this.getDataList() //获取历史数据列表
+      } else if (this.type === 2) {
+        this.getDataListTb()
+      }
+    },
     getDataList(page, size) {
       this.$http({
         url: this.$http.adornUrl(`/kanban/getListByTypeAndId`),
@@ -100,7 +111,8 @@ export default {
         params: this.$http.adornParams({
           resourceId: this.dataForm.id,
           resourceType: this.dataForm.type,
-          type: this.currentActive,
+          startTime: this.startTime,
+          endTime: this.endTime,
           page: page || this.pageIndex,
           rows: size || this.pageSize
         })
@@ -122,7 +134,8 @@ export default {
         params: this.$http.adornParams({
           region: this.dataForm.region,
           resourceId: this.dataForm.id,
-          type: this.currentActive
+          startTime: this.startTime,
+          endTime: this.endTime
         })
       }).then((data) => {
         if (data && data.code === 0) {

src/pages/kb/outdoor/history.vue

@@ -33,14 +33,16 @@ el-dialog(
             v-model="startTime"
             align="right"
             type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择日期")
           span( style="padding: 0 10px") 至
           el-date-picker(
             v-model="endTime"
             align="right"
             type="date"
+            value-format="yyyy-MM-dd"
             placeholder="选择日期")
-          el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search") 查询
+          el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search" @click="getList()") 查询
   span(v-if="type == 1")
     el-table(
       :data="dataList",
@@ -155,7 +157,7 @@ export default {
   },
   data() {
     return {
-            startTime: '',
+      startTime: '',
       endTime: '',
       type: null,
       pageIndex: 1,
@@ -187,6 +189,8 @@ export default {
 
   methods: {
     init(data, type) {
+      this.startTime = ''
+      this.endTime = ''
       this.dataForm = data
       this.type = type // 1=>>> 历史数据 / 2=>>> 统计图表
       this.visible = true
@@ -197,6 +201,13 @@ export default {
         this.getDataListTb()
       }
     },
+    getList() {
+      if (this.type === 1) {
+        this.getDataList() //获取历史数据列表
+      } else if (this.type === 2) {
+        this.getDataListTb()
+      }
+    },
     // 当日 ，本周
     handleDate(i) {
       this.currentActive = i
@@ -213,7 +224,8 @@ export default {
         params: this.$http.adornParams({
           resourceId: this.dataForm.id,
           resourceType: this.dataForm.type, //室外气象站
-          type: this.currentActive,
+          startTime: this.startTime,
+          endTime: this.endTime,
           page: page || this.pageIndex,
           rows: size || this.pageSize
         })
@@ -233,7 +245,8 @@ export default {
         url: this.$http.adornUrl('/analysis/getSwqxzInfoTj'),
         method: 'get',
         params: this.$http.adornParams({
-          type: this.currentActive
+          startTime: this.startTime,
+          endTime: this.endTime
         })
       }).then((data) => {
         if (data && data.code === 0) {

src/pages/kb/outdoor/index.vue

@@ -288,7 +288,8 @@ export default {
         url: this.$http.adornUrl('/analysis/getSwqxzInfoTj'),
         method: 'get',
         params: this.$http.adornParams({
-          type: this.type
+          startTime: '',
+          endTime: ''
         })
       }).then((data) => {
         if (data && data.code === 0) {

src/pages/kb/power/components/historyDataModal.vue

@@ -24,12 +24,31 @@
         ></el-input>
       </el-form-item>
       <el-form-item label="时间范围：">
-        <el-date-picker v-model="startTime" style="width:172px" size="mini" type="date" placeholder="选择日期" >
+        <el-date-picker
+          v-model="startTime"
+          style="width: 172px"
+          size="mini"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期"
+        >
         </el-date-picker>
-        <span style="padding:0 10px">至</span>
-        <el-date-picker  v-model="endTime" style="width:172px"  size="mini" type="date" placeholder="选择日期">
+        <span style="padding: 0 10px">至</span>
+        <el-date-picker
+          v-model="endTime"
+          style="width: 172px"
+          size="mini"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期"
+        >
         </el-date-picker>
-        <el-button type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search"
+        <el-button
+          type="primary"
+          style="margin-left: 10px"
+          size="mini"
+          icon="el-icon-search"
+          @click="getDataList()"
           >查询</el-button
         >
         <!-- <el-button
@@ -81,7 +100,7 @@ export default {
   },
   data() {
     return {
-            startTime: '',
+      startTime: '',
       endTime: '',
       visible: false,
       formLabelWidth: '0px',
@@ -114,7 +133,8 @@ export default {
         params: this.$http.adornParams({
           resourceId: this.dataForm.id, //资源点id
           resourceType: this.dataForm.type, //资源点类型
-          type: this.currentActive,
+          startTime: this.startTime,
+          endTime: this.endTime,
           page: page || this.pageIndex,
           rows: size || this.pageSize
         })

src/pages/kb/power/components/statisticPicTableModal.vue

@@ -5,7 +5,6 @@
     :append-to-body="true"
     @close="cancelhandlePic"
     width="1200px"
-
   >
     <el-form :inline="true" :model="dataForm">
       <el-form-item label="设备名称：" prop="name" style="margin-bottom: 0">
@@ -25,7 +24,6 @@
         ></el-input>
       </el-form-item>
       <el-form-item label="数据起止阶段：">
-
         <!-- <el-button
           size="mini"
           type="primary"
@@ -35,18 +33,42 @@
           :class="[item.id == currentActive ? 'isActive' : '']"
           >{{ item.name }}
         </el-button> -->
-        <el-date-picker v-model="startTime" style="width:172px" size="mini" type="date" placeholder="选择日期">
+        <el-date-picker
+          v-model="startTime"
+          style="width: 172px"
+          size="mini"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期"
+        >
         </el-date-picker>
-        <span style="padding:0 10px">至</span>
-        <el-date-picker  v-model="endTime" style="width:172px"  size="mini" type="date" placeholder="选择日期">
+        <span style="padding: 0 10px">至</span>
+        <el-date-picker
+          v-model="endTime"
+          style="width: 172px"
+          size="mini"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期"
+        >
         </el-date-picker>
-        <el-button type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search"
+        <el-button
+          type="primary"
+          style="margin-left: 10px"
+          size="mini"
+          icon="el-icon-search"
+          @click="getDataListTb()"
           >查询</el-button
         >
       </el-form-item>
     </el-form>
     <div v-if="statisticModalVisible" id="categoryId" style="height: 400px">
-      <chart id="111" :data="data" title="能耗数据(kwh)" color="#21ACFC"></chart>
+      <chart
+        id="111"
+        :data="data"
+        title="能耗数据(kwh)"
+        color="#21ACFC"
+      ></chart>
     </div>
   </el-dialog>
 </template>
@@ -60,7 +82,7 @@ export default {
   },
   data() {
     return {
-                  startTime: '',
+      startTime: '',
       endTime: '',
       formLabelWidth: '120px',
       dataForm: {},
@@ -90,7 +112,8 @@ export default {
         params: this.$http.adornParams({
           resourceType: this.dataForm.type,
           resourceId: this.dataForm.id,
-          type: this.currentActive
+          startTime: this.startTime,
+          endTime: this.endTime
         })
       }).then((data) => {
         if (data && data.code === 0) {