Merge

src/pages/analysis/fault/pie.vue

@@ -19,7 +19,7 @@ export default {
       if (!dom) return
       let myCharts = this.$echarts.init(dom)
       let option = {
-        color: ['skyblue', '#F2637B', '#8EE0E0', '#FFCC00'],
+        color: ['skyblue', '#F2637B', '#8EE0E0', '#FFCC00', '#4ECB74'],
         tooltip: {
           trigger: 'item'
         },

src/pages/analysis/fault/pie2.vue

@@ -25,7 +25,7 @@ export default {
       if (!dom) return
       let myCharts = this.$echarts.init(dom)
       let option = {
-        color: ['skyblue', '#F2637B', '#8EE0E0', '#FFCC00'],
+        color: ['skyblue', '#F2637B', '#8EE0E0', '#FFCC00', '#4ECB74'],
         tooltip: {
           trigger: 'item',
           formatter: '{a} <br/>{b} : {c} ({d}%)'

src/pages/eq/view/query-detail.vue

 <template lang="pug">
 .animation
   .info-title
-    //- | {{ dataForm.name }}
-    | 空调
+    | {{ dataForm.name }}
+    //- | 空调
     el-button(
       icon="el-icon-close",
       style="float: right",
@@ -15,16 +15,15 @@
     //- div(:class="dataForm.icon+'6'")
   .info-form(style="border-bottom: 1px solid #c0c0c0")
     .quDetailM
-      p.leftP 设备名称&nbsp;:&nbsp;&nbsp; 室内机
+      p.leftP 设备名称&nbsp;:&nbsp;&nbsp; {{ dataForm.name }}
     .quDetailM
-      p.leftP 设备编号&nbsp;:&nbsp;&nbsp; CDSLAKS-009
+      p.leftP 设备编号&nbsp;:&nbsp;&nbsp; {{ dataForm.code }}
     .quDetailM
-      p.leftP 设备品牌：&nbsp;:&nbsp;&nbsp;格力
+      p.leftP 设备品牌：&nbsp;:&nbsp;&nbsp;{{ dataForm.name }}
     .quDetailM
-      p.leftP 设备型号：&nbsp;:&nbsp;&nbsp;晶弘33-1
+      p.leftP 设备型号：&nbsp;:&nbsp;&nbsp;{{ dataForm.equipmentModel }}
     .quDetailM
-      p.leftP 安装日期：&nbsp;:&nbsp;&nbsp;2020-01-04
-      p.leftP 维保日期：&nbsp;:&nbsp;&nbsp;2020-01-15
+      p.leftP 安装日期：&nbsp;:&nbsp;&nbsp;{{ dataForm.installDate }}
   .info-form
     el-row
       el-col(:span="8")
@@ -38,13 +37,14 @@
         el-button(type="primary", size="mini", style="margin-left: 10px") 设定
     el-row
       el-col.text-size(:span="8") 当前已
-        span(v-if="state == 1") 打开
-        span(v-else) 关闭
+        span(v-if="dataForm.state == 1") 打开
+        span(v-else-if="dataForm.state == 2") 关闭
+        span(v-else) 故障
       el-col.text-size(:span="10") 当前频率：
         span(style="color: blue") 2289
         span &nbsp;转/分
   .info-state
-    span(style="font-weight: bold") 空调运行状态
+    span(style="font-weight: bold") 设备运行状态
     div
       span.type 电压：
       span.value 220 V
@@ -82,8 +82,8 @@ export default {
   created() {},
   methods: {
     init(data, stationId) {
+      console.log('---data:', data)
       this.dataForm = data
-      // this.stationId = stationId
       this.dataForm.operatorName = this.info.name
     },
 
@@ -206,7 +206,6 @@ export default {
     color: #46b6f9;
   }
 }
-
 </style>
 <style lang="scss">
 .instuctions_content {
@@ -218,12 +217,11 @@ export default {
   }
 }
 
-.el-icon-jfktg6{
+.el-icon-jfktg6 {
   width: 100%;
   height: 170px;
   text-align: center;
   background: url('../../../assets/images/kt.jpg') no-repeat center;
-  background-size:100% 100% ;
-
+  background-size: 100% 100%;
 }
 </style>

src/pages/kb/indoor/history.vue

 <template lang="pug">
   el-dialog(:title="type==1?'历史数据':'统计图表'", :close-on-click-modal='false', :visible.sync='visible' width='80%' :append-to-body='true')
-    el-form(:model='dataForm', size='mini' :inline='true' :rules='dataRule' ,ref='dataForm', @keyup.enter.native='dataFormSubmit()', label-width='120px')
+    el-form(:model='dataForm', size='mini' :inline='true' :rules='dataRule' ,ref='dataForm',  label-width='120px')
         el-form-item(label='设备名称', prop='name')
             el-input(v-model='dataForm.name', placeholder='设备名称' readOnly)
         el-form-item(label='设备编号', prop='code')

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

 <template>
   <el-dialog
     title="历史数据"
-    :visible.sync="historyDataModalVisible"
+    :visible.sync="visible"
     :append-to-body="true"
     @close="cancelhandle"
     width="1200px"
   >
-    <el-form :inline="true">
+    <el-form :inline="true" :model="dataForm">
       <el-form-item label="设备名称：" prop="name" style="margin-bottom: 0">
         <el-input
           v-model="dataForm.name"
@@ -53,33 +53,32 @@ import enTable from '../../../components/enTable'
 import tablePagination from '@/pages/components/tablePagination'
 const tableColums = [
   {
-    label: '功率',
-    prop: 'qq',
-    width: 200,
-    align: 'center'
-  },
-  {
-    label: '设备状态',
-    prop: 'ww',
+    label: '用电量',
+    prop: 'electric_energy',
     width: 200,
     align: 'center'
   },
+  // {
+  //   label: '设备状态',
+  //   prop: 'status',
+  //   width: 200,
+  //   align: 'center'
+  // },
   {
     label: '采集时间',
-    prop: 'ee',
+    prop: 'create_time',
     // width:200,
     align: 'center'
   }
 ]
 export default {
-  name: 'historyDataModal',
-  props: ['historyDataModalVisible'],
   components: {
     tablePagination,
     enTable
   },
   data() {
     return {
+      visible: false,
       formLabelWidth: '0px',
       pageIndex: 1,
       pageSize: 10,
@@ -98,6 +97,7 @@ export default {
   },
   methods: {
     init(data) {
+      this.visible = true
       this.dataForm = data
       this.currentActive = 1
       this.getDataList() //获取历史数据列表
@@ -124,7 +124,7 @@ export default {
       })
     },
     cancelhandle() {
-      this.$emit('cancelhandle')
+      this.visible = false
     },
     // 当日 ，本周
     handleDate(i) {

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

 <template>
   <el-dialog
     title="统计图表"
-    :visible.sync="statisticModalVisible"
+    :visible.sync="visible"
     :append-to-body="true"
     @close="cancelhandlePic"
   >
-    <el-form :inline="true">
-      <el-form-item label="设备名称：" style="margin-bottom: 0">
-        <el-input size="mini" autocomplete="off"></el-input>
+    <el-form :inline="true" :model="dataForm">
+      <el-form-item label="设备名称：" prop="name" style="margin-bottom: 0">
+        <el-input
+          v-model="dataForm.name"
+          size="mini"
+          autocomplete="off"
+          readOnly
+        ></el-input>
       </el-form-item>
-      <el-form-item label="设备编号：" style="margin-bottom: 0">
-        <el-input size="mini" autocomplete="off"></el-input>
+      <el-form-item label="设备编号：" prop="code" style="margin-bottom: 0">
+        <el-input
+          v-model="dataForm.code"
+          size="mini"
+          autocomplete="off"
+          readOnly
+        ></el-input>
       </el-form-item>
       <el-form-item label="数据起止阶段：">
         <!-- <el-date-picker
@@ -56,6 +66,7 @@ export default {
     return {
       formLabelWidth: '120px',
       dataForm: {},
+      visible: false,
       category: null,
       typeList: [
         { name: '当日', id: 1 },
@@ -69,6 +80,7 @@ export default {
   },
   methods: {
     init(data) {
+      this.visible = true
       this.dataForm = data
       this.currentActive = 1
       this.getDataListTb()
@@ -78,6 +90,7 @@ export default {
         url: this.$http.adornUrl('/analysis/getEnergyTb'),
         method: 'get',
         params: this.$http.adornParams({
+          resourceType: this.dataForm.type,
           resourceId: this.dataForm.id,
           type: this.currentActive
         })
@@ -89,7 +102,7 @@ export default {
       })
     },
     cancelhandlePic() {
-      this.$emit('cancelhandlePic')
+      this.visible = false
     },
     // 当日 ，本周
     handleDate(i) {

src/pages/kb/power/page.vue

@@ -87,12 +87,10 @@
     <history-data-modal
       :historyDataModalVisible="historyDataModalVisible"
       ref="historyDataModal"
-      v-on:cancelhandle="cancelhandle"
     ></history-data-modal>
     <statistic-pic-table-modal
       :statisticModalVisible="statisticModalVisible"
       ref="statisticPicTableModal"
-      v-on:cancelhandlePic="cancelhandlePic"
     ></statistic-pic-table-modal>
   </div>
 </template>
@@ -207,17 +205,6 @@ export default {
         }
       })
     },
-    cancelhandle() {
-      this.$nextTick(() => {
-        this.historyDataModalVisible = false
-      })
-    },
-    cancelhandlePic() {
-      this.$nextTick(() => {
-        this.statisticModalVisible = false
-      })
-    },
-
     openHistoryHandle(data) {
       console.log('用电：', data)
       this.historyDataModalVisible = true

src/pages/login/page.vue

@@ -310,7 +310,7 @@ export default {
                         //清空Cookie
                         this.clearCookie()
                       }
-                       this.$parent.getDateList();
+                      this.$parent.getDateList()
                     } else {
                       sessionStorage.removeItem('uuid')
                       sessionStorage.removeItem('token')