提交

src/pages/analysis/energy/page.vue

@@ -19,13 +19,12 @@
         </div>
         <div>
           <el-form :inline="true" size="mini" style="padding-top: 15px">
-            <!-- <el-form-item label="时间范围：">
+            <el-form-item label="时间范围：">
                 <el-date-picker
                   v-model="startTime"
                   align="right"
                   type="date"
                   placeholder="选择日期"
-                  :picker-options="pickerOptions"
                 >
                 </el-date-picker>
                 <span style="padding: 0 10px">至</span>
@@ -34,15 +33,14 @@
                   align="right"
                   type="date"
                   placeholder="选择日期"
-                  :picker-options="pickerOptions"
                 >
                 </el-date-picker>
               </el-form-item>
 
               <el-button type="primary" size="mini" icon="el-icon-search"
                 >查询</el-button
-              > -->
-            <el-form-item label="时间范围：">
+              >
+            <!-- <el-form-item label="时间范围：">
               <el-button
                 size="mini"
                 type="primary"
@@ -53,7 +51,7 @@
               >
                 {{ item.name }}
               </el-button>
-            </el-form-item>
+            </el-form-item> -->
           </el-form>
         </div>
         <div style="height: calc(100% - 70px)">
@@ -79,6 +77,8 @@ export default {
   },
   data() {
     return {
+      startTime: '',
+      endTime: '',
       activetap: '1',
       typeList: [
         { name: '当日', id: 1 },

src/pages/analysis/fault/index.vue

@@ -2,15 +2,29 @@
 card-warp(title="故障报警分析", height="45px", showBackground)
   div(slot="content")
     el-form(:inline="true", size="mini")
-      el-form-item(label="时间范围：")
-        el-button(
-          size="mini",
-          type="primary",
-          @click="handleDate(item.id)",
-          v-for="(item, index) in dateTypeList",
-          :key="index",
-          :class="[item.id == currentActive ? 'isActive' : '']"
-        ) {{ item.name }}
+      //- el-form-item(label="时间范围：")
+      //-   el-button(
+      //-     size="mini",
+      //-     type="primary",
+      //-     @click="handleDate(item.id)",
+      //-     v-for="(item, index) in dateTypeList",
+      //-     :key="index",
+      //-     :class="[item.id == currentActive ? 'isActive' : '']"
+      //-   ) {{ item.name }}
+      el-form-item( label="时间范围：")
+        el-date-picker(
+          v-model="startTime"
+          align="right"
+          type="date"
+          placeholder="选择日期")
+        span( style="padding: 0 10px") 至
+        el-date-picker(
+          v-model="endTime"
+          align="right"
+          type="date"
+          placeholder="选择日期")
+        el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search") 查询
+
     .echartsWarp(width="100%", flex)
       div
         .title 设备类型故障数量统计

src/pages/analysis/indoor/index.vue

@@ -10,15 +10,28 @@ card-warp(title="室内气象分析", height="45px")
       el-tab-pane(label="候车室区域", name="1")
       el-tab-pane(label="办公区域", name="2")
     el-form(:inline="true", size="mini")
-      el-form-item(label="时间范围：")
-        el-button(
-          size="mini",
-          type="primary",
-          @click="handleDate(item.id)",
-          v-for="(item, index) in typeList",
-          :key="index",
-          :class="[item.id == currentActive ? 'isActive' : '']"
-        ) {{ item.name }}
+      //- el-form-item(label="时间范围：")
+      //-   el-button(
+      //-     size="mini",
+      //-     type="primary",
+      //-     @click="handleDate(item.id)",
+      //-     v-for="(item, index) in typeList",
+      //-     :key="index",
+      //-     :class="[item.id == currentActive ? 'isActive' : '']"
+      //-   ) {{ item.name }}
+      el-form-item( label="时间范围：")
+        el-date-picker(
+          v-model="startTime"
+          align="right"
+          type="date"
+          placeholder="选择日期")
+        span( style="padding: 0 10px") 至
+        el-date-picker(
+          v-model="endTime"
+          align="right"
+          type="date"
+          placeholder="选择日期")
+        el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search") 查询
     .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")
@@ -32,6 +45,8 @@ export default {
   },
   data() {
     return {
+      startTime: '',
+      endTime: '',
       activeName: '1',
       typeList: [
         { name: '当日', id: 1 },

src/pages/kb/indoor/history.vue

@@ -5,15 +5,28 @@
             el-input(v-model='dataForm.name', placeholder='设备名称' readOnly)
         el-form-item(label='设备编号', prop='code')
             el-input(v-model='dataForm.code', placeholder='设备编号' readOnly)
-        el-form-item(label='数据起止阶段', prop='time')
-          el-button(
-            size="mini",
-            type="primary",
-            @click="handleDate(item.id)",
-            v-for="(item, index) in typeList",
-            :key="index",
-            :class="[item.id == currentActive ? 'isActive' : '']"
-          ) {{ item.name }}
+        //- el-form-item(label='数据起止阶段', prop='time')
+        //-   el-button(
+        //-     size="mini",
+        //-     type="primary",
+        //-     @click="handleDate(item.id)",
+        //-     v-for="(item, index) in typeList",
+        //-     :key="index",
+        //-     :class="[item.id == currentActive ? 'isActive' : '']"
+        //-   ) {{ item.name }}
+        el-form-item( label="时间范围：")
+          el-date-picker(
+            v-model="startTime"
+            align="right"
+            type="date"
+            placeholder="选择日期")
+          span( style="padding: 0 10px") 至
+          el-date-picker(
+            v-model="endTime"
+            align="right"
+            type="date"
+            placeholder="选择日期")
+          el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search") 查询
     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='序号')
@@ -42,6 +55,8 @@ export default {
   },
   data() {
     return {
+      startTime: '',
+      endTime: '',
       typeList: [
         { name: '当日', id: 1 },
         { name: '本周', id: 2 },

src/pages/kb/outdoor/history.vue

@@ -19,15 +19,28 @@ el-dialog(
       el-input(v-model="dataForm.name", placeholder="设备名称" readOnly)
     el-form-item(label="设备编号", prop="code")
       el-input(v-model="dataForm.code", placeholder="设备编号" readOnly)
-    el-form-item(label="数据起止阶段", prop="time")
-      el-button(
-        size="mini",
-        type="primary",
-        @click="handleDate(item.id)",
-        v-for="(item, index) in typeList",
-        :key="index",
-        :class="[item.id == currentActive ? 'isActive' : '']"
-      ) {{ item.name }}
+    //- el-form-item(label="数据起止阶段", prop="time")
+    //-   el-button(
+    //-     size="mini",
+    //-     type="primary",
+    //-     @click="handleDate(item.id)",
+    //-     v-for="(item, index) in typeList",
+    //-     :key="index",
+    //-     :class="[item.id == currentActive ? 'isActive' : '']"
+    //-   ) {{ item.name }}
+    el-form-item( label="时间范围：")
+          el-date-picker(
+            v-model="startTime"
+            align="right"
+            type="date"
+            placeholder="选择日期")
+          span( style="padding: 0 10px") 至
+          el-date-picker(
+            v-model="endTime"
+            align="right"
+            type="date"
+            placeholder="选择日期")
+          el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search") 查询
   span(v-if="type == 1")
     el-table(
       :data="dataList",
@@ -142,6 +155,8 @@ export default {
   },
   data() {
     return {
+            startTime: '',
+      endTime: '',
       type: null,
       pageIndex: 1,
       pageSize: 10,

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

@@ -23,13 +23,16 @@
           readOnly
         ></el-input>
       </el-form-item>
-      <el-form-item label="数据起止阶段：">
-        <!-- <el-date-picker style="width:172px" size="mini" type="date" placeholder="">
+      <el-form-item label="时间范围：">
+        <el-date-picker v-model="startTime" style="width:172px" size="mini" type="date" placeholder="选择日期" >
         </el-date-picker>
         <span style="padding:0 10px">至</span>
-        <el-date-picker style="width:172px"  size="mini" type="date" placeholder="">
-        </el-date-picker> -->
-        <el-button
+        <el-date-picker  v-model="endTime" style="width:172px"  size="mini" type="date" placeholder="选择日期">
+        </el-date-picker>
+        <el-button type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search"
+          >查询</el-button
+        >
+        <!-- <el-button
           size="mini"
           type="primary"
           @click="handleDate(item.id)"
@@ -37,7 +40,7 @@
           :key="index"
           :class="[item.id == currentActive ? 'isActive' : '']"
           >{{ item.name }}
-        </el-button>
+        </el-button> -->
       </el-form-item>
     </el-form>
     <enTable :tableData="historyData" :tableColums="tableColums"></enTable>
@@ -78,6 +81,8 @@ export default {
   },
   data() {
     return {
+            startTime: '',
+      endTime: '',
       visible: false,
       formLabelWidth: '0px',
       pageIndex: 1,

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

@@ -4,6 +4,8 @@
     :visible.sync="visible"
     :append-to-body="true"
     @close="cancelhandlePic"
+    width="1200px"
+
   >
     <el-form :inline="true" :model="dataForm">
       <el-form-item label="设备名称：" prop="name" style="margin-bottom: 0">
@@ -23,22 +25,8 @@
         ></el-input>
       </el-form-item>
       <el-form-item label="数据起止阶段：">
-        <!-- <el-date-picker
-          style="width:172px"
-          size="mini"
-          type="date"
-          placeholder=""
-        >
-        </el-date-picker>
-        <span style="padding: 0 10px">至</span>
-        <el-date-picker
-         style="width:172px"
-          size="mini"
-          type="date"
-          placeholder=""
-        >
-        </el-date-picker> -->
-        <el-button
+
+        <!-- <el-button
           size="mini"
           type="primary"
           @click="handleDate(item.id)"
@@ -46,7 +34,15 @@
           :key="index"
           :class="[item.id == currentActive ? 'isActive' : '']"
           >{{ item.name }}
-        </el-button>
+        </el-button> -->
+        <el-date-picker v-model="startTime" style="width:172px" size="mini" type="date" placeholder="选择日期">
+        </el-date-picker>
+        <span style="padding:0 10px">至</span>
+        <el-date-picker  v-model="endTime" style="width:172px"  size="mini" type="date" placeholder="选择日期">
+        </el-date-picker>
+        <el-button type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search"
+          >查询</el-button
+        >
       </el-form-item>
     </el-form>
     <div v-if="statisticModalVisible" id="categoryId" style="height: 400px">
@@ -64,6 +60,8 @@ export default {
   },
   data() {
     return {
+                  startTime: '',
+      endTime: '',
       formLabelWidth: '120px',
       dataForm: {},
       visible: false,