104模块

src/components/tools/UserMenu.vue

@@ -26,6 +26,7 @@
           </a-menu-item>
         </a-menu>
       </a-dropdown>-->
+      <a style="margin-left: 8px;" @click="handleScreen(0)">电量大屏</a>
       <a style="margin-left: 8px;" @click="handleScreen(1)">设备大屏</a>
       <a style="margin-left: 8px;" @click="handleScreen(2)">详情大屏</a>
       <a style="margin-left: 8px;" @click="handleScreen(3)">维保大屏</a>
@@ -89,7 +90,9 @@ export default {
     handleScreen (type) {
       const a = document.createElement('a')
       a.target = '_blank'
-      if (type === 1) {
+      if (type === 0) {
+        a.href = '/SwitchingRoomBigScreen'
+      } else if (type === 1) {
         a.href = '/InfoBigScreen'
       } else if (type === 2) {
         a.href = '/InfoDetailBigScreen'

src/views/sb/info/SbInfo.vue

@@ -68,6 +68,18 @@
                       </a-select>
                     </a-form-item>
                   </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="电力线路">
+                      <a-select v-model="queryParam.baoyangTimes" placeholder="请选择">
+                        <a-select-option
+                          v-for="(label,value) in lineMap"
+                          :key="value"
+                          :label="label"
+                          :value="parseInt(value)">{{ label }}
+                        </a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
                   <a-col :md="6" :sm="24">
                     <a-form-item label="生产商">
                       <a-input v-model="queryParam.producerName" placeholder="生产商名称"/>
@@ -285,6 +297,7 @@ export default {
       visible: true,
       sbPositionData: [],
       levelMap: {},
+      lineMap: {},
       unitMap: {},
       areaList: {},
       companyList: {},
@@ -536,6 +549,7 @@ export default {
     this.useTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_USE_TYPE)
     this.isChildMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_IS_CHILD)
     this.isShowMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_IS_SHOW)
+    this.lineMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REMOTE_LINE)
     querySbPosition().then(res => {
       this.sbPositionData = res.data
     })

src/views/sb/info/modules/BaseForm.vue

@@ -281,7 +281,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="handleChange" v-decorator="['baoyangTimes', {rules: [{required: false, message: '不能为空'}]}]" placeholder="请选择">
+            <a-select v-decorator="['baoyangTimes', {rules: [{required: false, message: '不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in lineMap"
                 :key="value"

src/views/statisticView/DayStatistics.vue

@@ -17,6 +17,9 @@
             </a-date-picker>
             {{ BaseTool.Date.formatter(time,dateVisual?BaseTool.Date.PICKER_NORM_DATE_PATTERN:BaseTool.Date.PICKER_NORM_YEAR_MONTH) }}
           </div>
+          <div class="dateStatistics" style="float:left">
+            <a-button type="primary" @click="doExport()">导出</a-button>
+          </div>
         </div>
         <div class="body">
           <table>
@@ -76,6 +79,9 @@ export default {
     },
     onOk (value) {
       console.log('onOk: ', value)
+    },
+    doExport () {
+
     }
   }
 }

src/views/statisticView/MonthStatistics.vue

@@ -13,6 +13,9 @@
             </a-month-picker>
             {{ BaseTool.Date.formatter(time,dateVisual?BaseTool.Date.PICKER_NORM_DATE_PATTERN:BaseTool.Date.PICKER_NORM_YEAR_MONTH) }}
           </div>
+          <div class="dateStatistics" style="float:left">
+            <a-button type="primary" @click="doExport()">导出</a-button>
+          </div>
         </div>
         <div class="body">
           <table>
@@ -72,6 +75,9 @@ export default {
     },
     onOk (value) {
       console.log('onOk: ', value)
+    },
+    doExport () {
+
     }
   }
 }

src/views/statisticView/SwitchingRoom.vue

@@ -95,10 +95,14 @@ export default {
       this.$router.push('/TransformerDetailBigScreen')
     },
     handleDayView () {
-      this.$router.push('/DayStatistics')
+      const a = document.createElement('a')
+      a.href = '/DayStatistics'
+      a.click()
     },
     handleMonthView () {
-      this.$router.push('/MonthStatistics')
+      const a = document.createElement('a')
+      a.href = '/MonthStatistics'
+      a.click()
     }
   }
 }