Merge branch 'master' of http://152.136.206.27:3000/dongjh/ems_client

src/views/module_base/energyRate/modules/EnergyRateForm.vue

@@ -3,6 +3,7 @@
      <j-form-container :disabled="formDisabled">
        <!-- 主表单区域 -->
        <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+         <div class="cmms-dialog-item-title">基本信息</div>
          <a-row>
           <a-col :xs="24" :sm="12">
             <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
@@ -26,16 +27,16 @@
           </a-col>
           <a-col :xs="24" :sm="12">
             <a-form-model-item label="费率有效期开始" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="begintime">
-              <j-date placeholder="请选择费率有效期开始" v-model="model.begintime" style="width: 100%" />
+              <j-date placeholder="请选择费率有效期开始" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" v-model="model.begintime" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12">
             <a-form-model-item label="费率有效期结束" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="endtime">
-              <j-date placeholder="请选择费率有效期结束" v-model="model.endtime" style="width: 100%" />
+              <j-date placeholder="请选择费率有效期结束" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" v-model="model.endtime" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="24">
-            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
+            <a-form-model-item label="备注" :labelCol="labelCol2" :wrapperCol="wrapperCol2" prop="remark">
               <a-textarea v-model="model.remark" placeholder="请输入备注" rows="3" ></a-textarea>
             </a-form-model-item>
           </a-col>
@@ -75,12 +76,20 @@
       return {
         labelCol: {
           xs: { span: 24 },
-          sm: { span: 5 },
+          sm: { span: 6 },
         },
         wrapperCol: {
           xs: { span: 24 },
           sm: { span: 16 },
         },
+        labelCol2: {
+          xs: { span: 24 },
+          sm: { span: 3 },
+        },
+        wrapperCol2: {
+          xs: { span: 24 },
+          sm: { span: 20 },
+        },
         model:{
         },
         validatorRules: {
@@ -120,7 +129,7 @@
               title: '分时开始时间',
               key: 'begintime',
               type: FormTypes.time,
-              width:"200px",
+              width:"190px",
               placeholder: '请输入${title}',
               defaultValue:'',
               validateRules: [{ required: true, message: '${title}不能为空' }],
@@ -129,24 +138,30 @@
               title: '分时结束时间',
               key: 'endtime',
               type: FormTypes.time,
-              width:"200px",
+              width:"190px",
               placeholder: '请输入${title}',
               defaultValue:'',
             },
             {
-              title: '峰平谷：尖、峰、谷、平',
+              title: '峰平谷',
               key: 'pandv',
-              type: FormTypes.input,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
+              type: FormTypes.select,
+              width:"190px",
+              placeholder: '请选择${title}',
+              defaultValue: '',
               validateRules: [{ required: true, message: '${title}不能为空' }],
+              options: [
+                {title:'尖',value:'尖'},
+                {title:'峰',value:'峰'},
+                {title:'谷',value:'谷'},
+                {title:'平',value:'平'}
+              ]
             },
             {
               title: '价格',
               key: 'price',
               type: FormTypes.input,
-              width:"200px",
+              width:"190px",
               placeholder: '请输入${title}',
               defaultValue:'',
               validateRules: [{ required: true, message: '${title}不能为空' }],
@@ -155,7 +170,7 @@
               title: '起始量',
               key: 'beginamount',
               type: FormTypes.input,
-              width:"200px",
+              width:"190px",
               placeholder: '请输入${title}',
               defaultValue:'',
               validateRules: [{ required: true, message: '${title}不能为空' }],
@@ -164,7 +179,7 @@
               title: '结束量',
               key: 'endamount',
               type: FormTypes.input,
-              width:"200px",
+              width:"190px",
               placeholder: '请输入${title}',
               defaultValue:'',
               // validateRules: [{ required: true, message: '${title}不能为空' }],
@@ -252,4 +267,5 @@
 </script>
 
 <style scoped>
+@import "~@/assets/less/uStyle.less";
 </style>

src/views/module_base/energyRate/modules/EnergyRateModal.vue

@@ -1,15 +1,15 @@
 <template>
-  <j-modal
+  <u-modal
     :title="title"
     :width="1200"
     :visible="visible"
     :maskClosable="false"
-    switchFullscreen
+    contentFull
     @ok="handleOk"
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel">
     <energy-rate-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
-  </j-modal>
+  </u-modal>
 </template>
 
 <script>

src/views/module_cmms/inspect/InspectList.vue

@@ -13,10 +13,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+              </a> -->
             </span>
           </a-col>
         </a-row>

src/views/module_cmms/inspect/modules/InspectForm.vue

@@ -339,10 +339,14 @@ const treeData1 = [
         if (selectedKeys.length === 0) return
         this.selectedKeys = selectedKeys
         // console.log('selected', selectedKeys, info);
-        // console.log(info.selectedNodes[0].data.props.inspectTcontentItemList)
+        console.log(info.selectedNodes[0].data.props)
         var props = info.selectedNodes[0].data.props
         if(props.type === '巡检内容'){
-          this.model.itemList = props.inspectTcontentItemList
+          // this.model.itemList = props.inspectTcontentItemList
+          this.model.itemList = props.inspectTcontentItemList.map(item => {
+            item.tcontequiptid = props.equipmentid
+            return item
+          })
           this.$forceUpdate()
           // this.getItemList(props.id)
         }

src/views/module_cmms/inspectAbnormalItems/InspectAbnormalItemsList.vue

@@ -0,0 +1,271 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="设备名称">
+              <a-input placeholder="请输入设备名称" v-model="queryParam.equipmentname"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="巡检标准名称">
+                <a-input placeholder="请输入巡检标准名称" v-model="queryParam.itemname"></a-input>
+              </a-form-item>
+            </a-col>
+            <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="状态">
+                <j-dict-select-tag v-model="queryParam.status" dictCode="common_status" placeholder="请选择状态" />
+              </a-form-item>
+            </a-col> -->
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
+      <a-button type="primary" icon="download" @click="handleExportXls('巡检工单')">导出</a-button>
+      <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload> -->
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown> -->
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+        <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <!-- <a @click="handleEdit(record)">查看</a>
+          <a-divider type="vertical" /> -->
+          <!-- <a @click="handleEdit(record)">确认</a> -->
+          <a-popconfirm title="是否执行异常项目确认操作？" @confirm="() => handleConfirm(record)">
+            <a>确认</a>
+          </a-popconfirm>
+          <a-divider type="vertical" />
+          <a-popconfirm title="是否执行异常项目转报修操作？" @confirm="() => handleTransrepair(record)">
+            <a>转报修</a>
+          </a-popconfirm>
+
+          <!-- <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown> -->
+        </span>
+
+      </a-table>
+    </div>
+
+  </a-card>
+</template>
+
+<script>
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { postAction } from '@/api/manage'
+
+  export default {
+    name: 'InspectList',
+    mixins:[JeecgListMixin, mixinDevice],
+    data () {
+      return {
+        description: '异常项目管理页面',
+        // 表头
+        columns: [
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'设备编号',
+            align:"center",
+            dataIndex: 'equipmentcode'
+          },
+          {
+            title:'设备名称',
+            align:"center",
+            dataIndex: 'equipmentname'
+          },
+          {
+            title:'反馈时间',
+            align:"center",
+            dataIndex: 'itime'
+          },
+          {
+            title:'安装地点',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'所属任务',
+            align:"center",
+            dataIndex: 'inspectname'
+          },
+          {
+            title:'巡检标准编号',
+            align:"center",
+            dataIndex: 'itemcode'
+          },
+          {
+            title:'巡检标准名称',
+            align:"center",
+            dataIndex: 'itemname'
+          },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'unusualstatus'
+          },
+          {
+            title:'处理人',
+            align:"center",
+            dataIndex: 'handleuser'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cmmsInspectTcontentItem/cmmsInspectTcontentItem/list",
+          queryById: "/cmmsInspectTcontentItem/cmmsInspectTcontentItem/queryById",
+          // exportXlsUrl: "/cmmsInspect/cmmsInspect/exportXls",
+          transrepair: "/cmmsInspectTcontentItem/cmmsInspectTcontentItem/transrepair",
+          confirm: "/cmmsInspectTcontentItem/cmmsInspectTcontentItem/confirm",
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      // 确认
+      handleConfirm(record){
+        postAction(this.url.confirm, record).then((res) => {
+          if(res.success){
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+        }).finally(() => {
+          // this.confirmLoading = false;
+        })
+      },
+      // 转报修
+      handleTransrepair(){
+        postAction(this.url.transrepair, record).then((res) => {
+          if(res.success){
+            this.$message.success(res.message);
+          }else{
+            this.$message.warning(res.message);
+          }
+        }).finally(() => {
+          // this.confirmLoading = false;
+        })
+      },
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        // fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
+        // fieldList.push({type:'string',value:'inspectcode',text:'工单编号',dictCode:''})
+        // fieldList.push({type:'string',value:'inspectname',text:'工单名称',dictCode:''})
+        // fieldList.push({type:'string',value:'tasktype',text:'任务类型：单次任务、周期任务',dictCode:''})
+        // fieldList.push({type:'string',value:'status',text:'状态：0待处理、1处理中、2已完成',dictCode:''})
+        // fieldList.push({type:'string',value:'inspectdetail',text:'巡检细项',dictCode:''})
+        // fieldList.push({type:'string',value:'inspectplanid',text:'巡检计划ID',dictCode:''})
+        // fieldList.push({type:'string',value:'chargeruser',text:'待办人',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/module_ems/energyAnalyse/demandAnalysis/index.vue

@@ -9,7 +9,6 @@
 import * as echarts from 'echarts'
 import commonSearch from '../components/commonSearch.vue'
 import { httpAction, getAction } from '@/api/manage'
-import { emsdata } from '../emsdata';
 export default {
   name: 'demandAnalysis',
   components: {
@@ -22,7 +21,7 @@ export default {
       echartsHeight: window.innerHeight - 84 - 60 - 30,
       myChart: null,
       url: {
-        list: '/ems/statistics/demandanalysis',
+        list: '/emsStatistics/demandanalysis',
       },
       monthsplit: [],
       mubiao: [153, 160, 145, 145, 125],
@@ -32,27 +31,19 @@ export default {
   created() {},
   mounted() {
     this.$nextTick(() => {
-      this.getTest()
-      // this.getDemandanalysis()
+      this.getDemandanalysis()
     })
   },
   methods: {
-    // 后端好了需要删掉
-    getTest() {
-      this.monthsplit = emsdata.demanddata.monthsplit
-      this.mubiao = emsdata.demanddata.mubiao
-      this.shiji = emsdata.demanddata.shiji
-      this.initEcharts()
-    },
     async getDemandanalysis() {
       this.loading = true
       var data = this.$refs.commonSearch.queryParams
       console.log(data)
       getAction(this.url.list, data).then((response) => {
         console.log(response)
-        this.monthsplit = response.data.monthsplit
-        this.mubiao = response.data.mubiao
-        this.shiji = response.data.shiji
+        this.monthsplit = response.result.monthsplit
+        this.mubiao = response.result.mubiao
+        this.shiji = response.result.shiji
         this.loading = false
       })
       this.initEcharts()
@@ -245,8 +236,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleSearch(param) {
-      this.getTest()
-      // this.getDemandanalysis()
+      this.getDemandanalysis()
     },
   },
 }

src/views/module_ems/energyAnalyse/energyDashboard/index.vue

@@ -90,7 +90,7 @@
 import * as echarts from 'echarts'
 import commonSearch from '../components/commonSearch'
 import { httpAction, getAction } from '@/api/manage'
-import { emsdata } from '../emsdata';
+// import { emsdata } from '../emsdata';
 export default {
   name: 'energyDashboard',
   components: {
@@ -130,73 +130,24 @@ export default {
       },
       zongbiao: [],
       url: {
-        list: '/ems/statistics/energyoverview',
+        list: '/emsStatistics/energyOverview',
       },
     }
   },
   created() {},
   mounted() {
     this.$nextTick(() => {
-      this.getTest()
-      // this.getEnergyoverview()
+      this.getEnergyoverview()
     })
   },
   methods: {
-    // 后端好了需要删掉
-    getTest() {
-      var listData = emsdata.dashboarddata
-      console.log(listData)
-      // 用电需量
-      this.demandStatistics.jishi = listData.demandStatistics.find((item) => item.type === '即时需量').howManyValue
-      this.demandStatistics.fengzhi = listData.demandStatistics.find((item) => item.type === '需量峰值').howManyValue
-      this.demandStatistics.mubiao = listData.demandStatistics.find((item) => item.type === '目标需量').howManyValue
-
-      // co2+气象
-      this.demandStatistics.co2 = listData.environmentStatistics.find((item) => item.type === 'CO2排放').howManyValue
-      this.demandStatistics.shidu = listData.environmentStatistics.find((item) => item.type === '室外湿度')
-        ? listData.environmentStatistics.find((item) => item.type === '室外湿度').howManyValue
-        : ''
-      this.demandStatistics.wendu = listData.environmentStatistics.find((item) => item.type === '室外温度')
-        ? listData.environmentStatistics.find((item) => item.type === '室外温度').howManyValue
-        : ''
-
-      // top5
-      this.sortTop5Name = []
-      this.nowMonthData = []
-      this.lastMonthData = []
-      listData.top5Statistics.forEach((res) => {
-        this.sortTop5Name.push(res.equipmentname)
-        this.nowMonthData.push(res.howManyValue)
-        this.lastMonthData.push(res.howManyValue2)
-      })
-
-      // 总标煤
-      this.zongbiao = listData.kgceStatistics.map((res) => {
-        var item = {
-          name: res.type,
-          value: res.howManyValue,
-        }
-        return item
-      })
-
-      this.totalEleTrend.daysplit = listData.daysplit
-      this.totalEleTrend.kongtiao = listData.kongtiao
-      this.totalEleTrend.dongli = listData.dongli
-      this.totalEleTrend.zhaoming = listData.zhaoming
-      this.totalEleTrend.qita = listData.qita
-      this.energySpace = listData.energySpace
-      this.loading = false
-      this.initSortTop5()
-      this.initPieDianliang()
-      this.initTotalEleTrend()
-    },
     async getEnergyoverview() {
       // {spaceId: 277797283102721}
       this.loading = true
       var data = this.$refs.commonSearch.queryParams
       getAction(this.url.list, data).then((res) => {
         console.log(res)
-        var listData = res.data
+        var listData = res.result
         // 用电需量
         this.demandStatistics.jishi = listData.demandStatistics.find((item) => item.type === '即时需量').howManyValue
         this.demandStatistics.fengzhi = listData.demandStatistics.find((item) => item.type === '需量峰值').howManyValue
@@ -245,8 +196,7 @@ export default {
       })
     },
     handleSearch(param) {
-      this.getTest()
-      // this.getEnergyoverview()
+      this.getEnergyoverview()
     },
     // 当月用电量TOP5 柱状图
     initSortTop5() {

src/views/module_ems/energyAnalyse/energyItem/index.vue

@@ -75,7 +75,6 @@
   import * as echarts from 'echarts';
   import commonSearch from '../components/commonSearch.vue'
   import { httpAction, getAction } from '@/api/manage'
-  import { emsdata } from '../emsdata';
   export default {
     name: 'energyItem',
     components: {
@@ -96,21 +95,16 @@
           lastMonth: null,
           huanbiMonth: null,
         },
-        dayPieData: [
-          { value: 2750.10, name: '照明插座' },
-          { value: 2368.90, name: '空调用电' },
-          { value: 2007.80, name: '其他用电' },
-          { value: 639.90, name: '动力用电' }
-        ],
+        dayPieData: [],
         weekPieData: [],
         monthPieData: [],
-        hours: ['11/29 00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00'],
-        kongtiao: [120, 132, 101, 134, 90, 230, 210],
-        dongli: [150, 212, 201, 154, 190, 330, 410],
-        zhaoming: [220, 182, 191, 234, 290, 330, 310],
-        qita: [320, 302, 301, 334, 390, 330, 320],
+        hours: [],
+        kongtiao: [],
+        dongli: [],
+        zhaoming: [],
+        qita: [],
         url: {
-          list: "/ems/statistics/itemizedenergy",
+          list: "/emsStatistics/itemizedenergy",
         },
       }
     },
@@ -118,74 +112,16 @@
     },
     mounted() {
       this.$nextTick(() => {
-        this.getTest()
-        // this.getItemizedenergy()
+        this.getItemizedenergy()
       })
     },
     methods: {
-      // 后端好了需要删掉
-      getTest() {
-        var listData = emsdata.itemdata
-        // 日
-        this.itemizedStatistics.nowDay = (listData.dayStatistics.find(item=>item.type === '当日用能')).howManyValue
-        this.itemizedStatistics.lastDay = (listData.dayStatistics.find(item=>item.type === '昨日用能')).howManyValue
-        this.itemizedStatistics.huanbiDay = (listData.dayStatistics.find(item=>item.type === '环比')).howManyValue
-        // 月
-        this.itemizedStatistics.nowMonth = (listData.monthStatistics.find(item=>item.type === '当月用能')).howManyValue
-        this.itemizedStatistics.lastMonth = (listData.monthStatistics.find(item=>item.type === '上月用能')).howManyValue
-        this.itemizedStatistics.huanbiMonth = (listData.monthStatistics.find(item=>item.type === '环比')).howManyValue
-        // listData.monthStatistics.find(item=>if (item.type === '环比') {return item.howManyValue})
-        // 周
-        this.itemizedStatistics.nowWeek = (listData.weekStatistics.find(item=>item.type === '当周用能')).howManyValue
-        this.itemizedStatistics.lastWeek = (listData.weekStatistics.find(item=>item.type === '上周用能')).howManyValue
-        this.itemizedStatistics.huanbiWeek = (listData.weekStatistics.find(item=>item.type === '环比')).howManyValue
-
-        this.dayPieData = listData.dayStatistics.map(res => {
-          if(res.type === '能耗分项'){
-            var item ={
-              name: res.equipmentname,
-              value: res.howManyValue,
-            }
-            return item
-          } 
-          
-        })
-        this.weekPieData = listData.weekStatistics.map(res => {
-          if(res.type === '能耗分项'){
-            var item ={
-              name: res.equipmentname,
-              value: res.howManyValue,
-            }
-            return item
-          }
-        })
-        this.monthPieData = listData.monthStatistics.map(res => {
-          if(res.type === '能耗分项'){
-            var item ={
-              name: res.equipmentname,
-              value: res.howManyValue,
-            }
-            return item
-          }
-        })
-        
-        this.hours = listData.hours
-        this.kongtiao = listData.kongtiao
-        this.dongli = listData.dongli
-        this.zhaoming = listData.zhaoming
-        this.qita = listData.qita
-      
-        this.initDayPieCharts()
-        this.initWeekPieCharts()
-        this.initMonthPieCharts()
-        this.initEcharts()
-      },
       async getItemizedenergy(){
         this.loading = true
         var data = this.$refs.commonSearch.queryParams
         getAction(this.url.list, data).then(response => {
           console.log(response)
-          var listData = response.data
+          var listData = response.result
           // 日
           this.itemizedStatistics.nowDay = (listData.dayStatistics.find(item=>item.type === '当日用能')).howManyValue
           this.itemizedStatistics.lastDay = (listData.dayStatistics.find(item=>item.type === '昨日用能')).howManyValue
@@ -496,8 +432,7 @@
       },
       /** 搜索按钮操作 */
       handleSearch(param) {
-        this.getTest()
-        // this.getItemizedenergy()
+        this.getItemizedenergy()
       }
     },
   }

src/views/module_ems/energyAnalyse/energyRank/index.vue

@@ -36,7 +36,6 @@ import * as echarts from 'echarts'
 import commonSearch from '../components/commonSearch.vue'
 import { httpAction, getAction } from '@/api/manage'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { emsdata } from '../emsdata';
 export default {
   name: 'energyRank',
   components: {
@@ -74,110 +73,38 @@ export default {
           dataIndex: 'otherValue2',
         },
       ],
-      tableData: [
-        {
-          equipmentname: '园区A栋3FAXA_P电',
-          howManyValue: '301672',
-          zhanbi: '21.73',
-          otherValue: '--',
-          otherValue2: '--',
-        },
-        {
-          equipmentname: '园区A栋2FAXA_L3电',
-          howManyValue: '230412',
-          zhanbi: '16.60',
-          otherValue: '--',
-          otherValue2: '--',
-        },
-        {
-          equipmentname: '园区A栋4FAXA_L3电',
-          howManyValue: '226125',
-          zhanbi: '16.29',
-          otherValue: '--',
-          otherValue2: '--',
-        },
-        {
-          equipmentname: '园区A栋2FAXA_LR电',
-          howManyValue: '212633',
-          zhanbi: '15.32',
-          otherValue: '--',
-          otherValue2: '--',
-        },
-        {
-          equipmentname: '园区A栋3FAXA_AC电',
-          howManyValue: '185498',
-          zhanbi: '13.36',
-          otherValue: '--',
-          otherValue2: '--',
-        },
-        {
-          equipmentname: '园区A栋2FAXA_P电',
-          howManyValue: '181028',
-          zhanbi: '13.23',
-          otherValue: '--',
-          otherValue2: '--',
-        },
-        {
-          equipmentname: '园区A栋1FAXA_L3电',
-          howManyValue: '176050',
-          zhanbi: '12.31',
-          otherValue: '--',
-          otherValue2: '--',
-        },
-      ],
-      yuanquName: [
-        '园区A栋1FAXA_L3电',
-        '园区A栋2FAXA_P电',
-        '园区A栋3FAXA_AC电',
-        '园区A栋2FAXA_LR电',
-        '园区A栋4FAXA_L3电',
-        '园区A栋2FAXA_L3电',
-        '园区A栋3FAXA_P电',
-      ],
-      numbers: [176050, 181028, 185498, 212633, 226125, 230412, 301672],
+      tableData: [],
+      yuanquName: [],
+      numbers: [],
       url: {
-        list: '/ems/statistics/ranking',
+        list: '/emsStatistics/ranking',
       },
     }
   },
   created() {},
   mounted() {
     this.$nextTick(() => {
-      this.getTest()
-      // this.getRanking()
+      this.getRanking()
     })
   },
   methods: {
-    // 后端好了需要删掉
-    getTest() {
-      this.tableData = emsdata.rankdata
-      var yuanquName, numbers
-      yuanquName = this.tableData.map((obj) => {
-        return obj.equipmentname
-      })
-      numbers = this.tableData.map((obj) => {
-        return obj.howManyValue
-      })
-      this.yuanquName = yuanquName.filter((item, index) => index < 10)
-      this.numbers = numbers.filter((item, index) => index < 10)
-      this.yuanquName.reverse()
-      this.numbers.reverse()
-      this.initEcharts()
-    },
     async getRanking() {
       this.loading = true
       var data = this.$refs.commonSearch.queryParams
       getAction(this.url.list, data).then((response) => {
-        this.tableData = response.data
-        var yuanquName, numbers
-        yuanquName = this.tableData.map((obj) => {
-          return obj.equipmentname
-        })
-        numbers = this.tableData.map((obj) => {
-          return obj.howManyValue
-        })
-        this.yuanquName = yuanquName.filter((item, index) => index < 10)
-        this.numbers = numbers.filter((item, index) => index < 10)
+        this.tableData = response.result.tableData
+        this.yuanquName = response.result.yuanquName
+        this.numbers = response.result.numbers
+        // var yuanquName, numbers
+        // yuanquName = this.tableData.map((obj) => {
+        //   return obj.equipmentname
+        // })
+        // numbers = this.tableData.map((obj) => {
+        //   return obj.howManyValue
+        // })
+        // this.yuanquName = yuanquName.filter((item, index) => index < 10)
+        // this.numbers = numbers.filter((item, index) => index < 10)
+
         this.yuanquName.reverse()
         this.numbers.reverse()
         this.loading = false
@@ -248,8 +175,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleSearch(param) {
-      this.getTest()
-      // this.getRanking()
+      this.getRanking()
     },
   },
 }

src/views/module_ems/energyAnalyse/flowAnalysis/index.vue

@@ -9,7 +9,6 @@
   import * as echarts from 'echarts';
   import commonSearch from '../components/commonSearch.vue'
   import { httpAction, getAction } from '@/api/manage'
-  import { emsdata } from '../emsdata';
   export default {
     name: 'flowAnalysis',
     components: {
@@ -24,7 +23,7 @@
         sourceData: [],
         linksData: [],
         url: {
-          list: "/ems/statistics/energyflowAnalysis",
+          list: "/emsStatistics/energyflowAnalysis",
         },
       }
     },
@@ -32,25 +31,18 @@
     },
     mounted() {
       this.$nextTick(() => {
-        // this.getEnergyflowAnalysis()
-        this.getTest()
+        this.getEnergyflowAnalysis()
       })
     },
     methods: {
-    // 后端好了需要删掉
-    getTest() {
-      this.sourceData = emsdata.flowdata.sourceData
-      this.linksData = emsdata.flowdata.linksData
-      this.initEcharts()
-    },
       async getEnergyflowAnalysis(){
         var _this = this
         _this.loading = true
         var data = _this.$refs.commonSearch.queryParams
         getAction(this.url.list, data).then(response => {
           console.log(response)
-          _this.sourceData = response.data.sourceData
-          _this.linksData = response.data.linksData
+          _this.sourceData = response.result.sourceData
+          _this.linksData = response.result.linksData
           _this.loading = false
         })
         _this.initEcharts()
@@ -130,8 +122,7 @@
       },
       /** 搜索按钮操作 */
       handleSearch(param) {
-        this.getTest()
-        // this.getEnergyflowAnalysis()
+        this.getEnergyflowAnalysis()
       }
     },
   }

src/views/module_ems/energyAnalyse/savingAnalysis/index.vue

@@ -27,7 +27,6 @@
 import * as echarts from 'echarts'
 import commonSearch from '../components/commonSearch.vue'
 import { httpAction, getAction } from '@/api/manage'
-import { emsdata } from '../emsdata';
 export default {
   name: 'savingAnalysis',
   components: {
@@ -41,52 +40,43 @@ export default {
       shijiAll: null,
       jihuaAll: null,
       leijiAll: null,
-      monthDate: ['08/01', '08/02','08/03', '04', '05', '06', '07','08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29' ,'30', '31'],
-      jienengData: [ 6256,13954,14856,14236,14368,14000,0,0,14056,14265,5999,0,14666,5258,6489,14888,0,14257,13999,14879,8899,8159,14148,14942,14025,14356,14943,0,0,14678,14977 ],
-      chaobiaoData: [ 0,0,0,0,0,0,9204,9015,0,0,0,18999,0,0,0,0,15111,0,0,0,0,0,0,0,0,0,0,10056,9752,0,0 ],
-      jihuaData: [ 9000, 15000, 15000, 15000, 15000, 15000, 9000, 9000, 15000, 15000, 15000, 15000, 15000, 9000, 9000, 15000, 15000, 15000, 15000, 15000, 9000, 9000, 15000, 15000, 15000, 15000, 15000, 9000, 9000, 15000, 15000],
-      leijiData: [2743,4100,4828,5768,6670,7929,7424,7315,8338,9193,18252,14124,14547.7,18245,20942.6,22420,22314.5,23049.2,24237.6,24572.8,24638.3,25072.3,25846.9,26014.3,26956.7,27639.2,27859.5,27213.1,26854,27254,27440.8],
+      monthDate: [],
+      // monthDate: ['08/01', '08/02','08/03', '04', '05', '06', '07','08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29' ,'30', '31'],
+      jienengData: [],
+      // jienengData: [ 6256,13954,14856,14236,14368,14000,0,0,14056,14265,5999,0,14666,5258,6489,14888,0,14257,13999,14879,8899,8159,14148,14942,14025,14356,14943,0,0,14678,14977 ],
+      chaobiaoData: [],
+      // chaobiaoData: [ 0,0,0,0,0,0,9204,9015,0,0,0,18999,0,0,0,0,15111,0,0,0,0,0,0,0,0,0,0,10056,9752,0,0 ],
+      jihuaData: [],
+      // jihuaData: [ 9000, 15000, 15000, 15000, 15000, 15000, 9000, 9000, 15000, 15000, 15000, 15000, 15000, 9000, 9000, 15000, 15000, 15000, 15000, 15000, 9000, 9000, 15000, 15000, 15000, 15000, 15000, 9000, 9000, 15000, 15000],
+      leijiData: [],
+      // leijiData: [2743,4100,4828,5768,6670,7929,7424,7315,8338,9193,18252,14124,14547.7,18245,20942.6,22420,22314.5,23049.2,24237.6,24572.8,24638.3,25072.3,25846.9,26014.3,26956.7,27639.2,27859.5,27213.1,26854,27254,27440.8],
       url: {
-        list: "/ems/statistics/savinganalysis",
+        list: "/emsStatistics/savinganalysis",
       },
     }
   },
   created() {},
   mounted() {
     this.$nextTick(() => {
-      this.getTest()
-      // this.getSavinganalysis()
+      this.getSavinganalysis()
     })
   },
   methods: {
-    // 后端好了需要删掉
-    getTest() {
-        this.jienengData = emsdata.savedata.jienengData
-        this.chaobiaoData = emsdata.savedata.chaobiaoData
-        this.jihuaData = emsdata.savedata.jihuaData
-        this.leijiData = emsdata.savedata.leijiData
-        this.monthDate = emsdata.savedata.monthDate
-        this.anlysis = emsdata.savedata.anlysis
-        this.jihuaAll = emsdata.savedata.jihuaAll
-        this.shijiAll = emsdata.savedata.shijiAll
-        this.leijiAll = emsdata.savedata.leijiAll
-      this.initEcharts()
-    },
     async getSavinganalysis() {
       this.loading = true
       var data = this.$refs.commonSearch.queryParams
       console.log(data)
       getAction(this.url.list, data).then((response) => {
         console.log(response)
-        this.jienengData = response.data.jienengData
-        this.chaobiaoData = response.data.chaobiaoData
-        this.jihuaData = response.data.jihuaData
-        this.leijiData = response.data.leijiData
-        this.monthDate = response.data.monthDate
-        this.anlysis = response.data.anlysis
-        this.jihuaAll = response.data.jihuaAll
-        this.shijiAll = response.data.shijiAll
-        this.leijiAll = response.data.leijiAll
+        this.jienengData = response.result.jienengData
+        this.chaobiaoData = response.result.chaobiaoData
+        this.jihuaData = response.result.jihuaData
+        this.leijiData = response.result.leijiData
+        this.monthDate = response.result.monthDate
+        this.anlysis = response.result.anlysis
+        this.jihuaAll = response.result.jihuaAll
+        this.shijiAll = response.result.shijiAll
+        this.leijiAll = response.result.leijiAll
         this.loading = false
       })
       this.initEcharts()
@@ -319,8 +309,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleSearch(param) {
-      this.getTest()
-      // this.getSavinganalysis()
+      this.getSavinganalysis()
     },
   },
 }

src/views/module_tpm/tag/TagList.vue

@@ -171,35 +171,35 @@
             align:"center",
             dataIndex: 'tagname'
           },
-          {
-            title:'点位地址',
-            align:"center",
-            dataIndex: 'tagaddress'
-          },
+          // {
+          //   title:'点位地址',
+          //   align:"center",
+          //   dataIndex: 'tagaddress'
+          // },
           {
             title:'点位类型',
             align:"center",
-            dataIndex: 'tagtype'
+            dataIndex: 'tagtype_dictText'
           },
           {
             title:'能源分类',
             align:"center",
-            dataIndex: 'energytypeid'
+            dataIndex: 'energytypeid_dictText'
           },
           {
             title:'能源分项',
             align:"center",
-            dataIndex: 'energyitemid'
+            dataIndex: 'energyitemid_dictText'
           },
           {
-            title:'下限',
+            title:'上限',
             align:"center",
-            dataIndex: 'min'
+            dataIndex: 'max'
           },
           {
-            title:'上限',
+            title:'下限',
             align:"center",
-            dataIndex: 'max'
+            dataIndex: 'min'
           },
           {
             title:'报警延时(分钟)',
@@ -216,16 +216,16 @@
             align:"center",
             dataIndex: 'param2'
           },
-          {
-            title:'当前点位值获得时间',
-            align:"center",
-            dataIndex: 'logtime'
-          },
-          {
-            title:'当前点位值',
-            align:"center",
-            dataIndex: 'tagvalue'
-          },
+          // {
+          //   title:'当前点位值获得时间',
+          //   align:"center",
+          //   dataIndex: 'logtime'
+          // },
+          // {
+          //   title:'当前点位值',
+          //   align:"center",
+          //   dataIndex: 'tagvalue'
+          // },
           // {
           //   title:'最后一次报警时间',
           //   align:"center",

src/views/module_tpm/tag/modules/TagForm.vue

@@ -21,34 +21,34 @@
                 </a-select>
             </a-form-model-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-model-item label="点位地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagaddress">
               <a-input v-model="model.tagaddress" placeholder="请输入点位地址"  ></a-input>
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="12">
             <a-form-model-item label="点位类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagtype">
-              <a-input v-model="model.tagtype" placeholder="请输入点位类型"  ></a-input>
+              <j-search-select-tag v-model="model.tagtype" placeholder="请选择点位类型" dict="tpm_tag_type"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="能源分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="energytypeid">
-              <a-input v-model="model.energytypeid" placeholder="请输入能源分类"  ></a-input>
+              <j-search-select-tag v-model="model.energytypeid" placeholder="请选择能源分类" dict="base_energy_type,name,id"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="能源分项" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="energyitemid">
-              <a-input v-model="model.energyitemid" placeholder="请输入能源分项"  ></a-input>
+              <j-search-select-tag v-model="model.energyitemid" placeholder="请选择能源分项" dict="base_energy_item,energyitemname,id"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
-            <a-form-model-item label="下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="min">
-              <a-input-number v-model="model.min" placeholder="请输入下限" style="width: 100%" />
+            <a-form-model-item label="上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="max">
+              <a-input-number v-model="model.max" placeholder="请输入上限" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
-            <a-form-model-item label="上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="max">
-              <a-input-number v-model="model.max" placeholder="请输入上限" style="width: 100%" />
+            <a-form-model-item label="下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="min">
+              <a-input-number v-model="model.min" placeholder="请输入下限" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
@@ -66,7 +66,7 @@
               <a-input v-model="model.param2" placeholder="请输入其他值2"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-model-item label="当前点位值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tagvalue">
               <a-input-number v-model="model.tagvalue" placeholder="请输入当前点位值" style="width: 100%" />
             </a-form-model-item>
@@ -75,7 +75,7 @@
             <a-form-model-item label="获得时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="logtime">
               <j-date placeholder="请选择当前点位值获得时间"  v-model="model.logtime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <!-- <a-col :span="12">
             <a-form-model-item label="最后一次报警时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lastalarmtime">
               <j-date placeholder="请选择最后一次报警时间"  v-model="model.lastalarmtime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />

src/views/module_tpm/tag/modulesPL/TagFormPL1.vue

@@ -62,16 +62,51 @@
                                         {{ record.tagname }}
                                     </a-form-model-item>
                                 </template>
-                                <template slot="tagaddress" slot-scope="text, record,index">
+                                <!-- <template slot="tagaddress" slot-scope="text, record,index">
                                     <a-form-model-item :prop="'data.'+index+'.tagaddress'" :rules="validatorRules.tagaddress" style="margin-bottom: 0px;">
                                         <a-input v-model="record.tagaddress"></a-input>
                                     </a-form-model-item>
-                                </template>
-                                <!-- <template slot="tagtype" slot-scope="text, record,index">
+                                </template> -->
+                                <template slot="tagtype" slot-scope="text, record,index">
                                     <a-form-model-item :prop="'data.'+index+'.tagtype'" :rules="validatorRules.tagtype" style="margin-bottom: 0px;">
-                                        <a-input v-model="record.tagtype"></a-input>
+                                        <j-search-select-tag v-model="record.tagtype" placeholder="请选择点位类型" dict="tpm_tag_type"/>
                                     </a-form-model-item>
-                                </template> -->
+                                </template>
+                                <template slot="energytypeid" slot-scope="text, record,index">
+                                    <a-form-model-item :prop="'data.'+index+'.energytypeid'" :rules="validatorRules.energytypeid" style="margin-bottom: 0px;">
+                                        <j-search-select-tag v-model="record.energytypeid" placeholder="请选择能源分类" dict="base_energy_type,name,id"/>
+                                    </a-form-model-item>
+                                </template>
+                                <template slot="energyitemid" slot-scope="text, record,index">
+                                    <a-form-model-item :prop="'data.'+index+'.energyitemid'" :rules="validatorRules.energyitemid" style="margin-bottom: 0px;">
+                                        <j-search-select-tag v-model="record.energyitemid" placeholder="请选择能源分项" dict="base_energy_item,energyitemname,id"/>
+                                    </a-form-model-item>
+                                </template>
+                                <template slot="max" slot-scope="text, record,index">
+                                    <a-form-model-item :prop="'data.'+index+'.max'" :rules="validatorRules.max" style="margin-bottom: 0px;">
+                                        <a-input-number v-model="record.max" placeholder="请输入上限" style="width: 100%" />
+                                    </a-form-model-item>
+                                </template>
+                                <template slot="min" slot-scope="text, record,index">
+                                    <a-form-model-item :prop="'data.'+index+'.min'" :rules="validatorRules.min" style="margin-bottom: 0px;">
+                                        <a-input-number v-model="record.min" placeholder="请输入下限" style="width: 100%" />
+                                    </a-form-model-item>
+                                </template>
+                                <template slot="delay" slot-scope="text, record,index">
+                                    <a-form-model-item :prop="'data.'+index+'.delay'" :rules="validatorRules.delay" style="margin-bottom: 0px;">
+                                        <a-input-number v-model="record.delay" placeholder="请输入报警延时(分钟)" style="width: 100%" />
+                                    </a-form-model-item>
+                                </template>
+                                <template slot="param1" slot-scope="text, record,index">
+                                    <a-form-model-item :prop="'data.'+index+'.param1'" :rules="validatorRules.param1" style="margin-bottom: 0px;">
+                                        <a-input v-model="record.param1" placeholder="请输入其他值1"  ></a-input>
+                                    </a-form-model-item>
+                                </template>
+                                <template slot="param2" slot-scope="text, record,index">
+                                    <a-form-model-item :prop="'data.'+index+'.param2'" :rules="validatorRules.param2" style="margin-bottom: 0px;">
+                                        <a-input v-model="record.param2" placeholder="请输入其他值2"  ></a-input>
+                                    </a-form-model-item>
+                                </template>
                                 <template slot="operation" slot-scope="text, record">
                                     <span>
                                         <a-popconfirm title="是否要删除此行？" @confirm="remove(record.key)">
@@ -120,20 +155,22 @@ export default {
                 dataIndex: 'tagname',
                 key: 'tagname',
                 align: 'center',
+                width: '12%',
                 scopedSlots: { customRender: 'tagname' }
                 },
-                {
-                title: '点位地址',
-                dataIndex: 'tagaddress',
-                key: 'tagaddress',
-                align: 'center',
-                scopedSlots: { customRender: 'tagaddress' }
-                },
+                // {
+                // title: '点位地址',
+                // dataIndex: 'tagaddress',
+                // key: 'tagaddress',
+                // align: 'center',
+                // scopedSlots: { customRender: 'tagaddress' }
+                // },
                 {
                 title: '点位类型',
                 dataIndex: 'tagtype',
                 key: 'tagtype',
                 align: 'center',
+                width: '10%',
                 scopedSlots: { customRender: 'tagtype' }
                 },
                 {
@@ -141,6 +178,7 @@ export default {
                 dataIndex: 'energytypeid',
                 key: 'energytypeid',
                 align: 'center',
+                width: '12%',
                 scopedSlots: { customRender: 'energytypeid' }
                 },
                 {
@@ -148,16 +186,10 @@ export default {
                 dataIndex: 'energyitemid',
                 key: 'energyitemid',
                 align: 'center',
+                width: '12%',
                 scopedSlots: { customRender: 'energyitemid' }
                 },
                 {
-                title: '下限',
-                dataIndex: 'min',
-                key: 'min',
-                align: 'center',
-                scopedSlots: { customRender: 'min' }
-                },
-                {
                 title: '上限',
                 dataIndex: 'max',
                 key: 'max',
@@ -165,6 +197,13 @@ export default {
                 scopedSlots: { customRender: 'max' }
                 },
                 {
+                title: '下限',
+                dataIndex: 'min',
+                key: 'min',
+                align: 'center',
+                scopedSlots: { customRender: 'min' }
+                },
+                {
                 title: '报警延时(分钟)',
                 dataIndex: 'delay',
                 key: 'delay',
@@ -185,24 +224,25 @@ export default {
                 align: 'center',
                 scopedSlots: { customRender: 'param2' }
                 },
-                {
-                title: '当前点位值',
-                dataIndex: 'tagvalue',
-                key: 'tagvalue',
-                align: 'center',
-                scopedSlots: { customRender: 'tagvalue' }
-                },
-                {
-                title: '获得时间',
-                dataIndex: 'logtime',
-                key: 'logtime',
-                align: 'center',
-                scopedSlots: { customRender: 'logtime' }
-                },
+                // {
+                // title: '当前点位值',
+                // dataIndex: 'tagvalue',
+                // key: 'tagvalue',
+                // align: 'center',
+                // scopedSlots: { customRender: 'tagvalue' }
+                // },
+                // {
+                // title: '获得时间',
+                // dataIndex: 'logtime',
+                // key: 'logtime',
+                // align: 'center',
+                // scopedSlots: { customRender: 'logtime' }
+                // },
                 {
                 title: '操作',
                 key: 'action',
                 align: 'center',
+                fixed:"right",
                 scopedSlots: { customRender: 'operation' }
                 }
             ],
@@ -317,7 +357,7 @@ export default {
 
 <style scoped>
 .center{
-    height: 100%;
+    height: calc(100vh - 150px);
     width: 100%;
     display: flex;
 }
@@ -340,7 +380,7 @@ export default {
     /* border: 2px solid red; */
 }
 .bottom{
-    height: 80%;
+    height: calc(100vh - 284px);
     width: 100%;
     display: flex;
     /* border: 2px solid red; */