设备数据优化，新增环境数据

itdmWeb/src/views/module-iTDM/itdmDataHistory/ItdmEnvironmentQuyuList.vue

@@ -0,0 +1,225 @@
+<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="区域名称">
+              <j-dict-select-tag placeholder="请选择区域" v-model="queryParam.areaName" dictCode="area_name"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="10" :lg="11" :md="12" :sm="24">
+            <a-form-item label="采集时间">
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
+              <span class="query-group-split-cust"></span>
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
+            </a-form-item>
+          </a-col>
+          <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">
+
+        <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-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>
+
+    <itdm-environment-quyu-modal ref="modalForm" @ok="modalFormOk"></itdm-environment-quyu-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ItdmEnvironmentQuyuModal from './modules/ItdmEnvironmentQuyuModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'ItdmEnvironmentQuyuList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ItdmEnvironmentQuyuModal
+    },
+    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: 'areaName_dictText'
+          },
+          {
+            title:'温度',
+            align:"center",
+            dataIndex: 'temperature'
+          },
+          {
+            title:'湿度',
+            align:"center",
+            dataIndex: 'humidity'
+          },
+          {
+            title:'气压',
+            align:"center",
+            dataIndex: 'airPrassure'
+          },
+          {
+            title:'采集时间',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
+        ],
+        url: {
+          list: "/itdmDataHistory/itdmEnvironmentQuyu/list",
+          delete: "/itdmDataHistory/itdmEnvironmentQuyu/delete",
+          deleteBatch: "/itdmDataHistory/itdmEnvironmentQuyu/deleteBatch",
+          exportXlsUrl: "/itdmDataHistory/itdmEnvironmentQuyu/exportXls",
+          importExcelUrl: "itdmDataHistory/itdmEnvironmentQuyu/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'areaName',text:'区域名称（1温箱区域2力学区域3霉菌区域）',dictCode:'area_name'})
+        fieldList.push({type:'BigDecimal',value:'temperature',text:'温度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidity',text:'湿度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'airPrassure',text:'气压',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'采集时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+  ::v-deep .ant-card-body{
+    padding-top: 0px !important;
+    padding-left: 10px !important;
+    padding-right: 10px !important;
+  }
+  .y {
+    color: red;
+  }
+</style>

itdmWeb/src/views/module-iTDM/itdmDataHistory/ItdmEnvironmentWaterList.vue

@@ -0,0 +1,219 @@
+<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="区域名称">
+              <j-dict-select-tag placeholder="请选择区域" v-model="queryParam.areaNameWater" dictCode="area_name_water"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="10" :lg="11" :md="12" :sm="24">
+            <a-form-item label="采集时间">
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
+              <span class="query-group-split-cust"></span>
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
+            </a-form-item>
+          </a-col>
+          <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">
+
+        <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-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>
+
+    <itdm-environment-water-modal ref="modalForm" @ok="modalFormOk"></itdm-environment-water-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ItdmEnvironmentWaterModal from './modules/ItdmEnvironmentWaterModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'ItdmEnvironmentWaterList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ItdmEnvironmentWaterModal
+    },
+    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: 'areaNameWater_dictText'
+          },
+          {
+            title:'温度',
+            align:"center",
+            dataIndex: 'temperature'
+          },
+          {
+            title:'水压',
+            align:"center",
+            dataIndex: 'waterPressure'
+          },
+          {
+            title:'采集时间',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
+        ],
+        url: {
+          list: "/itdmDataHistory/itdmEnvironmentWater/list",
+          delete: "/itdmDataHistory/itdmEnvironmentWater/delete",
+          deleteBatch: "/itdmDataHistory/itdmEnvironmentWater/deleteBatch",
+          exportXlsUrl: "/itdmDataHistory/itdmEnvironmentWater/exportXls",
+          importExcelUrl: "itdmDataHistory/itdmEnvironmentWater/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'int',value:'areaNameWater',text:'名称（0进水口，1出水口）',dictCode:'area_name_water'})
+        fieldList.push({type:'BigDecimal',value:'temperature',text:'温度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'waterPressure',text:'水压',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'采集时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+  ::v-deep .ant-card-body{
+    padding-top: 0px !important;
+    padding-left: 10px !important;
+    padding-right: 10px !important;
+  }
+  .y {
+    color: red;
+  }
+</style>

itdmWeb/src/views/module-iTDM/itdmDataHistory/ItdmEnvironmentYeweiList.vue

@@ -0,0 +1,201 @@
+<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="10" :lg="11" :md="12" :sm="24">
+            <a-form-item label="采集时间">
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
+              <span class="query-group-split-cust"></span>
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
+            </a-form-item>
+          </a-col>
+          <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">
+
+        <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-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>
+
+    <itdm-environment-yewei-modal ref="modalForm" @ok="modalFormOk"></itdm-environment-yewei-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ItdmEnvironmentYeweiModal from './modules/ItdmEnvironmentYeweiModal'
+
+  export default {
+    name: 'ItdmEnvironmentYeweiList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ItdmEnvironmentYeweiModal
+    },
+    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: 'waterLevel'
+          },
+          {
+            title:'采集时间',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
+        ],
+        url: {
+          list: "/itdmDataHistory/itdmEnvironmentYewei/list",
+          delete: "/itdmDataHistory/itdmEnvironmentYewei/delete",
+          deleteBatch: "/itdmDataHistory/itdmEnvironmentYewei/deleteBatch",
+          exportXlsUrl: "/itdmDataHistory/itdmEnvironmentYewei/exportXls",
+          importExcelUrl: "itdmDataHistory/itdmEnvironmentYewei/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'BigDecimal',value:'waterLevel',text:'水液位',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'采集时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+  ::v-deep .ant-card-body{
+    padding-top: 0px !important;
+    padding-left: 10px !important;
+    padding-right: 10px !important;
+  }
+  .y {
+    color: red;
+  }
+</style>

itdmWeb/src/views/module-iTDM/itdmDataHistory/modules/ItdmEnvironmentQuyuForm.vue

@@ -0,0 +1,124 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="区域名称（1温箱区域2力学区域3霉菌区域）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="areaName">
+              <j-dict-select-tag type="list" v-model="model.areaName" dictCode="area_name" placeholder="请选择区域名称（1温箱区域2力学区域3霉菌区域）" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperature">
+              <a-input-number v-model="model.temperature" placeholder="请输入温度" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidity">
+              <a-input-number v-model="model.humidity" placeholder="请输入湿度" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="气压" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="airPrassure">
+              <a-input-number v-model="model.airPrassure" placeholder="请输入气压" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="采集时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createTime">
+              <j-date placeholder="请选择采集时间"  v-model="model.createTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ItdmEnvironmentQuyuForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/itdmDataHistory/itdmEnvironmentQuyu/add",
+          edit: "/itdmDataHistory/itdmEnvironmentQuyu/edit",
+          queryById: "/itdmDataHistory/itdmEnvironmentQuyu/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

itdmWeb/src/views/module-iTDM/itdmDataHistory/modules/ItdmEnvironmentQuyuModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <itdm-environment-quyu-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></itdm-environment-quyu-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ItdmEnvironmentQuyuForm from './ItdmEnvironmentQuyuForm'
+
+  export default {
+    name: 'ItdmEnvironmentQuyuModal',
+    components: {
+      ItdmEnvironmentQuyuForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

itdmWeb/src/views/module-iTDM/itdmDataHistory/modules/ItdmEnvironmentQuyuModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <itdm-environment-quyu-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-environment-quyu-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ItdmEnvironmentQuyuForm from './ItdmEnvironmentQuyuForm'
+  export default {
+    name: 'ItdmEnvironmentQuyuModal',
+    components: {
+      ItdmEnvironmentQuyuForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

itdmWeb/src/views/module-iTDM/itdmDataHistory/modules/ItdmEnvironmentWaterForm.vue

@@ -0,0 +1,119 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="名称（0进水口，1出水口）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="areaNameWater">
+              <j-dict-select-tag type="list" v-model="model.areaNameWater" dictCode="area_name_water" placeholder="请选择名称（0进水口，1出水口）" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperature">
+              <a-input-number v-model="model.temperature" placeholder="请输入温度" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="水压" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="waterPressure">
+              <a-input-number v-model="model.waterPressure" placeholder="请输入水压" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="采集时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createTime">
+              <j-date placeholder="请选择采集时间"  v-model="model.createTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ItdmEnvironmentWaterForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/itdmDataHistory/itdmEnvironmentWater/add",
+          edit: "/itdmDataHistory/itdmEnvironmentWater/edit",
+          queryById: "/itdmDataHistory/itdmEnvironmentWater/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

itdmWeb/src/views/module-iTDM/itdmDataHistory/modules/ItdmEnvironmentWaterModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <itdm-environment-water-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></itdm-environment-water-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ItdmEnvironmentWaterForm from './ItdmEnvironmentWaterForm'
+
+  export default {
+    name: 'ItdmEnvironmentWaterModal',
+    components: {
+      ItdmEnvironmentWaterForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

itdmWeb/src/views/module-iTDM/itdmDataHistory/modules/ItdmEnvironmentWaterModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <itdm-environment-water-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-environment-water-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ItdmEnvironmentWaterForm from './ItdmEnvironmentWaterForm'
+  export default {
+    name: 'ItdmEnvironmentWaterModal',
+    components: {
+      ItdmEnvironmentWaterForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

itdmWeb/src/views/module-iTDM/itdmDataHistory/modules/ItdmEnvironmentYeweiForm.vue

@@ -0,0 +1,109 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="水液位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="waterLevel">
+              <a-input-number v-model="model.waterLevel" placeholder="请输入水液位" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="采集时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createTime">
+              <j-date placeholder="请选择采集时间"  v-model="model.createTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ItdmEnvironmentYeweiForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/itdmDataHistory/itdmEnvironmentYewei/add",
+          edit: "/itdmDataHistory/itdmEnvironmentYewei/edit",
+          queryById: "/itdmDataHistory/itdmEnvironmentYewei/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

itdmWeb/src/views/module-iTDM/itdmDataHistory/modules/ItdmEnvironmentYeweiModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <itdm-environment-yewei-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></itdm-environment-yewei-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ItdmEnvironmentYeweiForm from './ItdmEnvironmentYeweiForm'
+
+  export default {
+    name: 'ItdmEnvironmentYeweiModal',
+    components: {
+      ItdmEnvironmentYeweiForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

itdmWeb/src/views/module-iTDM/itdmDataHistory/modules/ItdmEnvironmentYeweiModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <itdm-environment-yewei-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-environment-yewei-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ItdmEnvironmentYeweiForm from './ItdmEnvironmentYeweiForm'
+  export default {
+    name: 'ItdmEnvironmentYeweiModal',
+    components: {
+      ItdmEnvironmentYeweiForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

itdmWeb/src/views/module-iTDM/itdmEnvironmentData/itdmEnvironmentData.vue

@@ -0,0 +1,54 @@
+<template>
+        <a-tabs default-active-key="1" @change="callback" class="card-container">
+            <a-tab-pane key="1" tab="区域环境数据">
+                <itdm-environment-quyu-list @ok="submitCallback" :key="timer1"></itdm-environment-quyu-list>
+            </a-tab-pane>
+            <a-tab-pane key="2" tab="进出水口数据" force-render>
+                <itdm-environment-water-list :key="timer2"></itdm-environment-water-list>
+            </a-tab-pane>
+            <a-tab-pane key="3" tab="水液位数据" force-render>
+                <itdm-environment-yewei-list :key="timer3"></itdm-environment-yewei-list>
+            </a-tab-pane>
+        </a-tabs>
+</template>
+
+<script>
+import ItdmEnvironmentQuyuList from '../itdmDataHistory/ItdmEnvironmentQuyuList.vue';
+import ItdmEnvironmentWaterList from '../itdmDataHistory/ItdmEnvironmentWaterList.vue';
+import ItdmEnvironmentYeweiList from '../itdmDataHistory/ItdmEnvironmentYeweiList.vue';
+  export default {
+    name: 'itdmEnvironmentDataList',
+    components: {
+        ItdmEnvironmentQuyuList,
+        ItdmEnvironmentWaterList,
+        ItdmEnvironmentYeweiList
+    },
+    data () {
+      return {
+        timer1: '',
+        timer2: '',
+        timer3: '',
+      }
+    },
+    methods: {
+      submitCallback(){
+        this.$emit('ok');
+      },
+      callback(key) {
+        if (key == 1) {
+          this.timer1 = new Date().getTime()
+        } else if (key == 2) {
+          this.timer2 = new Date().getTime()
+        } else if (key == 3) {
+          this.timer3 = new Date().getTime()
+        }
+      },
+    }
+  }
+</script>
+
+<style scoped>
+.ant-card-body{
+    padding-top: 10px !important;
+}
+</style>

itdmWeb/src/views/module-iTDM/itdmWenxiang/ItdmWenxiangList.vue

@@ -50,10 +50,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert" style="margin-bottom: 9px;">
-        <!-- <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>
+      <!-- <div class="ant-alert" style="margin-bottom: 9px;">
+        <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"
@@ -67,23 +67,24 @@
         :loading="loading"
         class="j-table-force-nowrap"
         @change="handleTableChange">
-
-        <!-- <template #headerCell="{ column }">
-          <template v-if="column.key === 'name'">
-            <span>
-              <smile-outlined />
-              Name
-            </span>
-          </template>
-        </template> -->
-
-        <!-- <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'temperature'">
-            <a>
-              {{ record.temperature }}
-            </a>
-          </template>
-        </template> -->
+        
+        <!-- 通过判断temperatureAlarm的值，动态渲染temperature这一列单元格的样式 -->
+        <div slot="temperature" slot-scope="text, record">
+          <span v-if="record.temperatureAlarm ==1" class="y">{{text}}</span>
+          <span v-else>{{text}}</span>
+        </div>
+        <div slot="humidity" slot-scope="text, record">
+          <span :class="record.humidityAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentA" slot-scope="text, record">
+          <span :class="record.currentAAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentB" slot-scope="text, record">
+          <span :class="record.currentBAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="currentC" slot-scope="text, record">
+          <span :class="record.currentCAlarm == 1?'y':''">{{text}}</span>
+        </div>
 
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
@@ -178,7 +179,8 @@
           {
             title:'温度',
             align:"center",
-            dataIndex: 'temperature'
+            dataIndex: 'temperature',
+            scopedSlots: { customRender: 'temperature' }
           },
           {
             title:'温度Max',
@@ -198,7 +200,8 @@
           {
             title:'湿度',
             align:"center",
-            dataIndex: 'humidity'
+            dataIndex: 'humidity',
+            scopedSlots: { customRender: 'humidity' }
           },
           {
             title:'湿度Max',
@@ -218,7 +221,8 @@
           {
             title:'A相电流',
             align:"center",
-            dataIndex: 'currentA'
+            dataIndex: 'currentA',
+            scopedSlots: { customRender: 'currentA' }
           },
           {
             title:'A相电流Max',
@@ -238,7 +242,8 @@
           {
             title:'B相电流',
             align:"center",
-            dataIndex: 'currentB'
+            dataIndex: 'currentB',
+            scopedSlots: { customRender: 'currentB' }
           },
           {
             title:'B相电流Max',
@@ -258,7 +263,8 @@
           {
             title:'C相电流',
             align:"center",
-            dataIndex: 'currentC'
+            dataIndex: 'currentC',
+            scopedSlots: { customRender: 'currentC' }
           },
           {
             title:'C相电流Max',
@@ -309,6 +315,9 @@
       },
     },
     methods: {
+      abc(record){
+        console.log(record)
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

itdmWeb/src/views/module-iTDM/itdmWenxiangVoltage/ItdmWenxiangVoltageList.vue

@@ -45,10 +45,10 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert" style="margin-bottom: 19px;">
-        <!-- <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>
+      <!-- <div class="ant-alert" style="margin-bottom: 19px;">
+        <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"
@@ -63,6 +63,16 @@
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
+        <div slot="voltageA" slot-scope="text, record">
+          <span :class="record.voltageAAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="voltageB" slot-scope="text, record">
+          <span :class="record.voltageBAlarm == 1?'y':''">{{text}}</span>
+        </div>
+        <div slot="voltageC" slot-scope="text, record">
+          <span :class="record.voltageCAlarm == 1?'y':''">{{text}}</span>
+        </div>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -140,7 +150,8 @@
           {
             title:'A线电压',
             align:"center",
-            dataIndex: 'voltageA'
+            dataIndex: 'voltageA',
+            scopedSlots: { customRender: 'voltageA' }
           },
           {
             title:'A线电压Max',
@@ -160,7 +171,8 @@
           {
             title:'B线电压',
             align:"center",
-            dataIndex: 'voltageB'
+            dataIndex: 'voltageB',
+            scopedSlots: { customRender: 'voltageB' }
           },
           {
             title:'B线电压Max',
@@ -180,7 +192,8 @@
           {
             title:'C线电压',
             align:"center",
-            dataIndex: 'voltageC'
+            dataIndex: 'voltageC',
+            scopedSlots: { customRender: 'voltageC' }
           },
           {
             title:'C线电压Max',