Merge remote-tracking branch 'origin/master'

itdmWeb/src/views/module-iTDM/itdmDevicedata/itdmDevicedataList.vue

@@ -1,27 +1,71 @@
 <template>
         <a-tabs default-active-key="1" @change="callback" class="card-container">
-            <a-tab-pane key="1" tab="温箱试验数据">
-                <itdm-wenxiang-list @ok="submitCallback" :key="timer1"></itdm-wenxiang-list>
-            </a-tab-pane>
-            <a-tab-pane key="2" tab="通用电压数据" force-render>
-                <itdm-wenxiang-voltage-list :key="timer2"></itdm-wenxiang-voltage-list>
-            </a-tab-pane>
+          <a-tab-pane key="1" tab="温箱试验数据">
+            <itdm-wenxiang-list @ok="submitCallback" :key="timer1"></itdm-wenxiang-list>
+          </a-tab-pane>
+          <a-tab-pane key="2" tab="通用电压数据" force-render>
+            <itdm-wenxiang-voltage-list :key="timer2"></itdm-wenxiang-voltage-list>
+          </a-tab-pane>
+          <a-tab-pane key="3" tab="0.5立方温箱试验数据" force-render>
+            <ItdmWenxiangHistory05List :key="timer3"></ItdmWenxiangHistory05List>
+          </a-tab-pane>
+          <a-tab-pane key="4" tab="1立方温箱试验数据" force-render>
+            <ItdmWenxiangHistory1List :key="timer4"></ItdmWenxiangHistory1List>
+          </a-tab-pane>
+          <a-tab-pane key="5" tab="8立方温箱试验数据" force-render>
+            <ItdmWenxiangHistory8List :key="timer5"></ItdmWenxiangHistory8List>
+          </a-tab-pane>
+          <a-tab-pane key="6" tab="16立方温箱试验数据" force-render>
+            <ItdmWenxiangHistory16List :key="timer6"></ItdmWenxiangHistory16List>
+          </a-tab-pane>
+          <a-tab-pane key="7" tab="48立方温箱试验数据" force-render>
+            <ItdmWenxiangHistory48List :key="timer7"></ItdmWenxiangHistory48List>
+          </a-tab-pane>
+          <a-tab-pane key="8" tab="霉菌温箱试验数据" force-render>
+            <ItdmWenxiangHistoryMjList :key="timer8"></ItdmWenxiangHistoryMjList>
+          </a-tab-pane>
+          <a-tab-pane key="9" tab="三综合温箱试验数据" force-render>
+            <ItdmWenxiangHistorySzhList :key="timer9"></ItdmWenxiangHistorySzhList>
+          </a-tab-pane>
         </a-tabs>
 </template>
 
 <script>
 import ItdmWenxiangList from '../itdmWenxiang/ItdmWenxiangList.vue'
 import ItdmWenxiangVoltageList from '../itdmWenxiangVoltage/ItdmWenxiangVoltageList.vue';
+import ItdmWenxiangHistory05List from '../itdmWenxiangHistory/ItdmWenxiangHistory05List.vue'
+import ItdmWenxiangHistory1List from '../itdmWenxiangHistory/ItdmWenxiangHistory1List'
+import ItdmWenxiangHistory8List from '../itdmWenxiangHistory/ItdmWenxiangHistory8List.vue'
+import ItdmWenxiangHistory16List from '../itdmWenxiangHistory/ItdmWenxiangHistory16List.vue'
+import ItdmWenxiangHistory48List from '../itdmWenxiangHistory/ItdmWenxiangHistory48List.vue'
+import ItdmWenxiangHistoryMjList from '../itdmWenxiangHistory/ItdmWenxiangHistoryMjList.vue'
+import ItdmWenxiangHistorySzhList from '../itdmWenxiangHistory/ItdmWenxiangHistorySzhList.vue'
+
+
   export default {
     name: 'itdmDeviceDataList',
     components: {
-        ItdmWenxiangList,
-        ItdmWenxiangVoltageList
+      ItdmWenxiangList,
+      ItdmWenxiangVoltageList,
+      ItdmWenxiangHistory05List,
+      ItdmWenxiangHistory1List,
+      ItdmWenxiangHistory8List,
+      ItdmWenxiangHistory16List,
+      ItdmWenxiangHistory48List,
+      ItdmWenxiangHistoryMjList,
+      ItdmWenxiangHistorySzhList
     },
     data () {
       return {
         timer1: '',
         timer2: '',
+        timer3: '',
+        timer4: '',
+        timer5: '',
+        timer6: '',
+        timer7: '',
+        timer8: '',
+        timer9: '',
       }
     },
     methods: {
@@ -33,6 +77,20 @@ import ItdmWenxiangVoltageList from '../itdmWenxiangVoltage/ItdmWenxiangVoltageL
           this.timer1 = new Date().getTime()
         } else if (key == 2) {
           this.timer2 = new Date().getTime()
+        } else if (key == 3) {
+          this.timer3 = new Date().getTime()
+        }else if (key == 4) {
+          this.timer4 = new Date().getTime()
+        }else if (key == 5) {
+          this.timer5 = new Date().getTime()
+        }else if (key == 6) {
+          this.timer6 = new Date().getTime()
+        }else if (key == 7) {
+          this.timer7 = new Date().getTime()
+        }else if (key == 8) {
+          this.timer8 = new Date().getTime()
+        }else if (key == 9) {
+          this.timer9 = new Date().getTime()
         }
       },
     }

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistory05List.vue

@@ -0,0 +1,338 @@
+<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('0.5立方温箱历史数据')">导出</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>-->
+
+      <!-- 通过判断alarm的值，动态渲染对应数据这一列单元格的样式 -->
+      <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>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        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-wenxiang-history05-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history05-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ItdmWenxiangHistory05Modal from './modules/ItdmWenxiangHistory05Modal'
+
+  export default {
+    name: 'ItdmWenxiangHistory05List',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ItdmWenxiangHistory05Modal
+    },
+    data () {
+      return {
+        description: '0.5立方温箱历史数据管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'设备名称',
+            align:"center",
+            dataIndex: 'deviceName'
+          },
+          {
+            title:'设备编号',
+            align:"center",
+            dataIndex: 'deviceNo'
+          },
+          {
+            title:'温度',
+            align:"center",
+            dataIndex: 'temperature'
+          },
+          {
+            title:'温度上限',
+            align:"center",
+            dataIndex: 'temperatureMax'
+          },
+          {
+            title:'温度下限',
+            align:"center",
+            dataIndex: 'temperatureMin'
+          },
+          {
+            title:'温度报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'temperatureAlarm'
+          },
+          {
+            title:'湿度',
+            align:"center",
+            dataIndex: 'humidity'
+          },
+          {
+            title:'湿度上限',
+            align:"center",
+            dataIndex: 'humidityMax'
+          },
+          {
+            title:'湿度下限',
+            align:"center",
+            dataIndex: 'humidityMin'
+          },
+          {
+            title:'湿度报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'humidityAlarm'
+          },
+          {
+            title:'A相电流',
+            align:"center",
+            dataIndex: 'currentA'
+          },
+          {
+            title:'A相电流上限',
+            align:"center",
+            dataIndex: 'currentAMax'
+          },
+          {
+            title:'A相电流下限',
+            align:"center",
+            dataIndex: 'currentAMin'
+          },
+          {
+            title:'A相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentAAlarm'
+          },
+          {
+            title:'B相电流',
+            align:"center",
+            dataIndex: 'currentB'
+          },
+          {
+            title:'B相电流上限',
+            align:"center",
+            dataIndex: 'currentBMax'
+          },
+          {
+            title:'B相电流下限',
+            align:"center",
+            dataIndex: 'currentBMin'
+          },
+          {
+            title:'B相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentBAlarm'
+          },
+          {
+            title:'C相电流',
+            align:"center",
+            dataIndex: 'currentC'
+          },
+          {
+            title:'C相电流上限',
+            align:"center",
+            dataIndex: 'currentCMax'
+          },
+          {
+            title:'C相电流下限',
+            align:"center",
+            dataIndex: 'currentCMin'
+          },
+          {
+            title:'C相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentCAlarm'
+          },
+          {
+            title:'创建时间',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/itdmWenxiangHistory/itdmWenxiangHistory05/list",
+          delete: "/itdmWenxiangHistory/itdmWenxiangHistory05/delete",
+          deleteBatch: "/itdmWenxiangHistory/itdmWenxiangHistory05/deleteBatch",
+          exportXlsUrl: "/itdmWenxiangHistory/itdmWenxiangHistory05/exportXls",
+          importExcelUrl: "itdmWenxiangHistory/itdmWenxiangHistory05/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:'deviceName',text:'设备名称',dictCode:''})
+        fieldList.push({type:'string',value:'deviceNo',text:'设备编号',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperature',text:'温度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMax',text:'温度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMin',text:'温度下限',dictCode:''})
+        fieldList.push({type:'int',value:'temperatureAlarm',text:'温度报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidity',text:'湿度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMax',text:'湿度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMin',text:'湿度下限',dictCode:''})
+        fieldList.push({type:'int',value:'humidityAlarm',text:'湿度报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentA',text:'A相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMax',text:'A相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMin',text:'A相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentAAlarm',text:'A相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentB',text:'B相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMax',text:'B相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMin',text:'B相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentBAlarm',text:'B相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentC',text:'C相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMax',text:'C相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMin',text:'C相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentCAlarm',text:'C相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistory16List.vue

@@ -0,0 +1,326 @@
+<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('16立方温箱历史数据')">导出</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"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        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-wenxiang-history16-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history16-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ItdmWenxiangHistory16Modal from './modules/ItdmWenxiangHistory16Modal'
+
+  export default {
+    name: 'ItdmWenxiangHistory16List',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ItdmWenxiangHistory16Modal
+    },
+    data () {
+      return {
+        description: '16立方温箱历史数据管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'设备id',
+            align:"center",
+            dataIndex: 'deviceId'
+          },
+          {
+            title:'设备名称',
+            align:"center",
+            dataIndex: 'deviceName'
+          },
+          {
+            title:'设备编号',
+            align:"center",
+            dataIndex: 'deviceNo'
+          },
+          {
+            title:'温度',
+            align:"center",
+            dataIndex: 'temperature'
+          },
+          {
+            title:'温度上限',
+            align:"center",
+            dataIndex: 'temperatureMax'
+          },
+          {
+            title:'温度下限',
+            align:"center",
+            dataIndex: 'temperatureMin'
+          },
+          {
+            title:'温度报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'temperatureAlarm'
+          },
+          {
+            title:'湿度',
+            align:"center",
+            dataIndex: 'humidity'
+          },
+          {
+            title:'湿度上限',
+            align:"center",
+            dataIndex: 'humidityMax'
+          },
+          {
+            title:'湿度下限',
+            align:"center",
+            dataIndex: 'humidityMin'
+          },
+          {
+            title:'湿度报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'humidityAlarm'
+          },
+          {
+            title:'A相电流',
+            align:"center",
+            dataIndex: 'currentA'
+          },
+          {
+            title:'A相电流上限',
+            align:"center",
+            dataIndex: 'currentAMax'
+          },
+          {
+            title:'A相电流下限',
+            align:"center",
+            dataIndex: 'currentAMin'
+          },
+          {
+            title:'A相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentAAlarm'
+          },
+          {
+            title:'B相电流',
+            align:"center",
+            dataIndex: 'currentB'
+          },
+          {
+            title:'B相电流上限',
+            align:"center",
+            dataIndex: 'currentBMax'
+          },
+          {
+            title:'B相电流下限',
+            align:"center",
+            dataIndex: 'currentBMin'
+          },
+          {
+            title:'B相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentBAlarm'
+          },
+          {
+            title:'C相电流',
+            align:"center",
+            dataIndex: 'currentC'
+          },
+          {
+            title:'C相电流上限',
+            align:"center",
+            dataIndex: 'currentCMax'
+          },
+          {
+            title:'C相电流下限',
+            align:"center",
+            dataIndex: 'currentCMin'
+          },
+          {
+            title:'C相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentCAlarm'
+          },
+          {
+            title:'创建时间',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/itdmWenxiangHistory/itdmWenxiangHistory16/list",
+          delete: "/itdmWenxiangHistory/itdmWenxiangHistory16/delete",
+          deleteBatch: "/itdmWenxiangHistory/itdmWenxiangHistory16/deleteBatch",
+          exportXlsUrl: "/itdmWenxiangHistory/itdmWenxiangHistory16/exportXls",
+          importExcelUrl: "itdmWenxiangHistory/itdmWenxiangHistory16/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:'deviceId',text:'设备id',dictCode:''})
+        fieldList.push({type:'string',value:'deviceName',text:'设备名称',dictCode:''})
+        fieldList.push({type:'string',value:'deviceNo',text:'设备编号',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperature',text:'温度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMax',text:'温度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMin',text:'温度下限',dictCode:''})
+        fieldList.push({type:'int',value:'temperatureAlarm',text:'温度报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidity',text:'湿度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMax',text:'湿度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMin',text:'湿度下限',dictCode:''})
+        fieldList.push({type:'int',value:'humidityAlarm',text:'湿度报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentA',text:'A相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMax',text:'A相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMin',text:'A相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentAAlarm',text:'A相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentB',text:'B相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMax',text:'B相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMin',text:'B相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentBAlarm',text:'B相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentC',text:'C相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMax',text:'C相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMin',text:'C相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentCAlarm',text:'C相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistory1List.vue

@@ -0,0 +1,339 @@
+<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('1立方温箱历史数据')">导出</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>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <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"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <!-- 通过判断alarm的值，动态渲染对应数据这一列单元格的样式 -->
+        <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>
+        </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-wenxiang-history1-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history1-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ItdmWenxiangHistory1Modal from './modules/ItdmWenxiangHistory1Modal'
+
+  export default {
+    name: 'ItdmWenxiangHistory1List',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ItdmWenxiangHistory1Modal
+    },
+    data () {
+      return {
+        description: '1立方温箱历史数据管理页面',
+        // 表头
+        columns: [
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          {
+            title:'设备名称',
+            align:"center",
+            dataIndex: 'deviceName'
+          },
+          {
+            title:'设备编号',
+            align:"center",
+            dataIndex: 'deviceNo'
+          },
+          {
+            title:'温度',
+            align:"center",
+            dataIndex: 'temperature'
+          },
+          {
+            title:'温度上限',
+            align:"center",
+            dataIndex: 'temperatureMax'
+          },
+          {
+            title:'温度下限',
+            align:"center",
+            dataIndex: 'temperatureMin'
+          },
+          // {
+          //   title:'温度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'temperatureAlarm_dictText'
+          // },
+          {
+            title:'湿度',
+            align:"center",
+            dataIndex: 'humidity'
+          },
+          {
+            title:'湿度上限',
+            align:"center",
+            dataIndex: 'humidityMax'
+          },
+          {
+            title:'湿度下限',
+            align:"center",
+            dataIndex: 'humidityMin'
+          },
+          // {
+          //   title:'湿度报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'humidityAlarm_dictText'
+          // },
+          {
+            title:'A相电流',
+            align:"center",
+            dataIndex: 'currentA'
+          },
+          {
+            title:'A相电流上限',
+            align:"center",
+            dataIndex: 'currentAMax'
+          },
+          {
+            title:'A相电流下限',
+            align:"center",
+            dataIndex: 'currentAMin'
+          },
+          // {
+          //   title:'A相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentAAlarm_dictText'
+          // },
+          {
+            title:'B相电流',
+            align:"center",
+            dataIndex: 'currentB'
+          },
+          {
+            title:'B相电流上限',
+            align:"center",
+            dataIndex: 'currentBMax'
+          },
+          {
+            title:'B相电流下限',
+            align:"center",
+            dataIndex: 'currentBMin'
+          },
+          // {
+          //   title:'B相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentBAlarm_dictText'
+          // },
+          {
+            title:'C相电流',
+            align:"center",
+            dataIndex: 'currentC'
+          },
+          {
+            title:'C相电流上限',
+            align:"center",
+            dataIndex: 'currentCMax'
+          },
+          {
+            title:'C相电流下限',
+            align:"center",
+            dataIndex: 'currentCMin'
+          },
+          // {
+          //   title:'C相电流报警（0正常1报警）',
+          //   align:"center",
+          //   dataIndex: 'currentCAlarm_dictText'
+          // },
+          {
+            title:'创建时间',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime'
+          },
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
+        ],
+        url: {
+          list: "/itdmWenxiangHistory/itdmWenxiangHistory1/list",
+          delete: "/itdmWenxiangHistory/itdmWenxiangHistory1/delete",
+          deleteBatch: "/itdmWenxiangHistory/itdmWenxiangHistory1/deleteBatch",
+          exportXlsUrl: "/itdmWenxiangHistory/itdmWenxiangHistory1/exportXls",
+          importExcelUrl: "itdmWenxiangHistory/itdmWenxiangHistory1/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:'deviceName',text:'设备名称',dictCode:''})
+        fieldList.push({type:'string',value:'deviceNo',text:'设备编号',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperature',text:'温度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMax',text:'温度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMin',text:'温度下限',dictCode:''})
+        fieldList.push({type:'int',value:'temperatureAlarm',text:'温度报警（0正常1报警）',dictCode:'data_status'})
+        fieldList.push({type:'BigDecimal',value:'humidity',text:'湿度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMax',text:'湿度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMin',text:'湿度下限',dictCode:''})
+        fieldList.push({type:'int',value:'humidityAlarm',text:'湿度报警（0正常1报警）',dictCode:'data_status'})
+        fieldList.push({type:'BigDecimal',value:'currentA',text:'A相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMax',text:'A相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMin',text:'A相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentAAlarm',text:'A相电流报警（0正常1报警）',dictCode:'data_status'})
+        fieldList.push({type:'BigDecimal',value:'currentB',text:'B相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMax',text:'B相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMin',text:'B相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentBAlarm',text:'B相电流报警（0正常1报警）',dictCode:'data_status'})
+        fieldList.push({type:'BigDecimal',value:'currentC',text:'C相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMax',text:'C相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMin',text:'C相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentCAlarm',text:'C相电流报警（0正常1报警）',dictCode:'data_status'})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistory48List.vue

@@ -0,0 +1,320 @@
+<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('48立方温箱数据')">导出</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"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        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-wenxiang-history48-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history48-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ItdmWenxiangHistory48Modal from './modules/ItdmWenxiangHistory48Modal'
+
+  export default {
+    name: 'ItdmWenxiangHistory48List',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ItdmWenxiangHistory48Modal
+    },
+    data () {
+      return {
+        description: '48立方温箱数据管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'设备名称',
+            align:"center",
+            dataIndex: 'deviceName'
+          },
+          {
+            title:'设备编号',
+            align:"center",
+            dataIndex: 'deviceNo'
+          },
+          {
+            title:'温度',
+            align:"center",
+            dataIndex: 'temperature'
+          },
+          {
+            title:'温度上限',
+            align:"center",
+            dataIndex: 'temperatureMax'
+          },
+          {
+            title:'温度下限',
+            align:"center",
+            dataIndex: 'temperatureMin'
+          },
+          {
+            title:'温度报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'temperatureAlarm'
+          },
+          {
+            title:'湿度',
+            align:"center",
+            dataIndex: 'humidity'
+          },
+          {
+            title:'湿度上限',
+            align:"center",
+            dataIndex: 'humidityMax'
+          },
+          {
+            title:'湿度下限',
+            align:"center",
+            dataIndex: 'humidityMin'
+          },
+          {
+            title:'湿度报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'humidityAlarm'
+          },
+          {
+            title:'A相电流',
+            align:"center",
+            dataIndex: 'currentA'
+          },
+          {
+            title:'A相电流上限',
+            align:"center",
+            dataIndex: 'currentAMax'
+          },
+          {
+            title:'A相电流下限',
+            align:"center",
+            dataIndex: 'currentAMin'
+          },
+          {
+            title:'A相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentAAlarm'
+          },
+          {
+            title:'B相电流',
+            align:"center",
+            dataIndex: 'currentB'
+          },
+          {
+            title:'B相电流上限',
+            align:"center",
+            dataIndex: 'currentBMax'
+          },
+          {
+            title:'B相电流下限',
+            align:"center",
+            dataIndex: 'currentBMin'
+          },
+          {
+            title:'B相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentBAlarm'
+          },
+          {
+            title:'C相电流',
+            align:"center",
+            dataIndex: 'currentC'
+          },
+          {
+            title:'C相电流上限',
+            align:"center",
+            dataIndex: 'currentCMax'
+          },
+          {
+            title:'C相电流下限',
+            align:"center",
+            dataIndex: 'currentCMin'
+          },
+          {
+            title:'C相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentCAlarm'
+          },
+          {
+            title:'创建时间',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/itdmWenxiangHistory/itdmWenxiangHistory48/list",
+          delete: "/itdmWenxiangHistory/itdmWenxiangHistory48/delete",
+          deleteBatch: "/itdmWenxiangHistory/itdmWenxiangHistory48/deleteBatch",
+          exportXlsUrl: "/itdmWenxiangHistory/itdmWenxiangHistory48/exportXls",
+          importExcelUrl: "itdmWenxiangHistory/itdmWenxiangHistory48/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:'deviceName',text:'设备名称',dictCode:''})
+        fieldList.push({type:'string',value:'deviceNo',text:'设备编号',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperature',text:'温度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMax',text:'温度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMin',text:'温度下限',dictCode:''})
+        fieldList.push({type:'int',value:'temperatureAlarm',text:'温度报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidity',text:'湿度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMax',text:'湿度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMin',text:'湿度下限',dictCode:''})
+        fieldList.push({type:'int',value:'humidityAlarm',text:'湿度报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentA',text:'A相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMax',text:'A相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMin',text:'A相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentAAlarm',text:'A相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentB',text:'B相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMax',text:'B相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMin',text:'B相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentBAlarm',text:'B相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentC',text:'C相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMax',text:'C相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMin',text:'C相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentCAlarm',text:'C相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistory8List.vue

@@ -0,0 +1,320 @@
+<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('8立方温箱历史数据')">导出</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"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        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-wenxiang-history8-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history8-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ItdmWenxiangHistory8Modal from './modules/ItdmWenxiangHistory8Modal'
+
+  export default {
+    name: 'ItdmWenxiangHistory8List',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ItdmWenxiangHistory8Modal
+    },
+    data () {
+      return {
+        description: '8立方温箱历史数据管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'设备名称',
+            align:"center",
+            dataIndex: 'deviceName'
+          },
+          {
+            title:'设备编号',
+            align:"center",
+            dataIndex: 'deviceNo'
+          },
+          {
+            title:'温度',
+            align:"center",
+            dataIndex: 'temperature'
+          },
+          {
+            title:'温度上限',
+            align:"center",
+            dataIndex: 'temperatureMax'
+          },
+          {
+            title:'温度下限',
+            align:"center",
+            dataIndex: 'temperatureMin'
+          },
+          {
+            title:'温度报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'temperatureAlarm'
+          },
+          {
+            title:'湿度',
+            align:"center",
+            dataIndex: 'humidity'
+          },
+          {
+            title:'湿度上限',
+            align:"center",
+            dataIndex: 'humidityMax'
+          },
+          {
+            title:'湿度下限',
+            align:"center",
+            dataIndex: 'humidityMin'
+          },
+          {
+            title:'湿度报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'humidityAlarm'
+          },
+          {
+            title:'A相电流',
+            align:"center",
+            dataIndex: 'currentA'
+          },
+          {
+            title:'A相电流上限',
+            align:"center",
+            dataIndex: 'currentAMax'
+          },
+          {
+            title:'A相电流下限',
+            align:"center",
+            dataIndex: 'currentAMin'
+          },
+          {
+            title:'A相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentAAlarm'
+          },
+          {
+            title:'B相电流',
+            align:"center",
+            dataIndex: 'currentB'
+          },
+          {
+            title:'B相电流上限',
+            align:"center",
+            dataIndex: 'currentBMax'
+          },
+          {
+            title:'B相电流下限',
+            align:"center",
+            dataIndex: 'currentBMin'
+          },
+          {
+            title:'B相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentBAlarm'
+          },
+          {
+            title:'C相电流',
+            align:"center",
+            dataIndex: 'currentC'
+          },
+          {
+            title:'C相电流上限',
+            align:"center",
+            dataIndex: 'currentCMax'
+          },
+          {
+            title:'C相电流下限',
+            align:"center",
+            dataIndex: 'currentCMin'
+          },
+          {
+            title:'C相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentCAlarm'
+          },
+          {
+            title:'创建时间',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/itdmWenxiangHistory/itdmWenxiangHistory8/list",
+          delete: "/itdmWenxiangHistory/itdmWenxiangHistory8/delete",
+          deleteBatch: "/itdmWenxiangHistory/itdmWenxiangHistory8/deleteBatch",
+          exportXlsUrl: "/itdmWenxiangHistory/itdmWenxiangHistory8/exportXls",
+          importExcelUrl: "itdmWenxiangHistory/itdmWenxiangHistory8/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:'deviceName',text:'设备名称',dictCode:''})
+        fieldList.push({type:'string',value:'deviceNo',text:'设备编号',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperature',text:'温度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMax',text:'温度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMin',text:'温度下限',dictCode:''})
+        fieldList.push({type:'int',value:'temperatureAlarm',text:'温度报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidity',text:'湿度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMax',text:'湿度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMin',text:'湿度下限',dictCode:''})
+        fieldList.push({type:'int',value:'humidityAlarm',text:'湿度报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentA',text:'A相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMax',text:'A相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMin',text:'A相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentAAlarm',text:'A相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentB',text:'B相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMax',text:'B相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMin',text:'B相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentBAlarm',text:'B相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentC',text:'C相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMax',text:'C相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMin',text:'C相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentCAlarm',text:'C相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistoryMjList.vue

@@ -0,0 +1,320 @@
+<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"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        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-wenxiang-history-mj-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history-mj-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ItdmWenxiangHistoryMjModal from './modules/ItdmWenxiangHistoryMjModal'
+
+  export default {
+    name: 'ItdmWenxiangHistoryMjList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ItdmWenxiangHistoryMjModal
+    },
+    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: 'deviceName'
+          },
+          {
+            title:'设备编号',
+            align:"center",
+            dataIndex: 'deviceNo'
+          },
+          {
+            title:'温度',
+            align:"center",
+            dataIndex: 'temperature'
+          },
+          {
+            title:'温度上限',
+            align:"center",
+            dataIndex: 'temperatureMax'
+          },
+          {
+            title:'温度下限',
+            align:"center",
+            dataIndex: 'temperatureMin'
+          },
+          {
+            title:'温度报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'temperatureAlarm'
+          },
+          {
+            title:'湿度',
+            align:"center",
+            dataIndex: 'humidity'
+          },
+          {
+            title:'湿度上限',
+            align:"center",
+            dataIndex: 'humidityMax'
+          },
+          {
+            title:'湿度下限',
+            align:"center",
+            dataIndex: 'humidityMin'
+          },
+          {
+            title:'湿度报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'humidityAlarm'
+          },
+          {
+            title:'A相电流',
+            align:"center",
+            dataIndex: 'currentA'
+          },
+          {
+            title:'A相电流上限',
+            align:"center",
+            dataIndex: 'currentAMax'
+          },
+          {
+            title:'A相电流下限',
+            align:"center",
+            dataIndex: 'currentAMin'
+          },
+          {
+            title:'A相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentAAlarm'
+          },
+          {
+            title:'B相电流',
+            align:"center",
+            dataIndex: 'currentB'
+          },
+          {
+            title:'B相电流上限',
+            align:"center",
+            dataIndex: 'currentBMax'
+          },
+          {
+            title:'B相电流下限',
+            align:"center",
+            dataIndex: 'currentBMin'
+          },
+          {
+            title:'B相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentBAlarm'
+          },
+          {
+            title:'C相电流',
+            align:"center",
+            dataIndex: 'currentC'
+          },
+          {
+            title:'C相电流上限',
+            align:"center",
+            dataIndex: 'currentCMax'
+          },
+          {
+            title:'C相电流下限',
+            align:"center",
+            dataIndex: 'currentCMin'
+          },
+          {
+            title:'C相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentCAlarm'
+          },
+          {
+            title:'创建时间',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/itdmWenxiangHistory/itdmWenxiangHistoryMj/list",
+          delete: "/itdmWenxiangHistory/itdmWenxiangHistoryMj/delete",
+          deleteBatch: "/itdmWenxiangHistory/itdmWenxiangHistoryMj/deleteBatch",
+          exportXlsUrl: "/itdmWenxiangHistory/itdmWenxiangHistoryMj/exportXls",
+          importExcelUrl: "itdmWenxiangHistory/itdmWenxiangHistoryMj/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:'deviceName',text:'设备名称',dictCode:''})
+        fieldList.push({type:'string',value:'deviceNo',text:'设备编号',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperature',text:'温度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMax',text:'温度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMin',text:'温度下限',dictCode:''})
+        fieldList.push({type:'int',value:'temperatureAlarm',text:'温度报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidity',text:'湿度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMax',text:'湿度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMin',text:'湿度下限',dictCode:''})
+        fieldList.push({type:'int',value:'humidityAlarm',text:'湿度报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentA',text:'A相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMax',text:'A相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMin',text:'A相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentAAlarm',text:'A相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentB',text:'B相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMax',text:'B相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMin',text:'B相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentBAlarm',text:'B相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentC',text:'C相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMax',text:'C相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMin',text:'C相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentCAlarm',text:'C相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/ItdmWenxiangHistorySzhList.vue

@@ -0,0 +1,320 @@
+<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"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        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-wenxiang-history-szh-modal ref="modalForm" @ok="modalFormOk"></itdm-wenxiang-history-szh-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ItdmWenxiangHistorySzhModal from './modules/ItdmWenxiangHistorySzhModal'
+
+  export default {
+    name: 'ItdmWenxiangHistorySzhList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ItdmWenxiangHistorySzhModal
+    },
+    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: 'deviceName'
+          },
+          {
+            title:'设备编号',
+            align:"center",
+            dataIndex: 'deviceNo'
+          },
+          {
+            title:'温度',
+            align:"center",
+            dataIndex: 'temperature'
+          },
+          {
+            title:'温度上限',
+            align:"center",
+            dataIndex: 'temperatureMax'
+          },
+          {
+            title:'温度下限',
+            align:"center",
+            dataIndex: 'temperatureMin'
+          },
+          {
+            title:'温度报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'temperatureAlarm'
+          },
+          {
+            title:'湿度',
+            align:"center",
+            dataIndex: 'humidity'
+          },
+          {
+            title:'湿度上限',
+            align:"center",
+            dataIndex: 'humidityMax'
+          },
+          {
+            title:'湿度下限',
+            align:"center",
+            dataIndex: 'humidityMin'
+          },
+          {
+            title:'湿度报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'humidityAlarm'
+          },
+          {
+            title:'A相电流',
+            align:"center",
+            dataIndex: 'currentA'
+          },
+          {
+            title:'A相电流上限',
+            align:"center",
+            dataIndex: 'currentAMax'
+          },
+          {
+            title:'A相电流下限',
+            align:"center",
+            dataIndex: 'currentAMin'
+          },
+          {
+            title:'A相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentAAlarm'
+          },
+          {
+            title:'B相电流',
+            align:"center",
+            dataIndex: 'currentB'
+          },
+          {
+            title:'B相电流上限',
+            align:"center",
+            dataIndex: 'currentBMax'
+          },
+          {
+            title:'B相电流下限',
+            align:"center",
+            dataIndex: 'currentBMin'
+          },
+          {
+            title:'B相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentBAlarm'
+          },
+          {
+            title:'C相电流',
+            align:"center",
+            dataIndex: 'currentC'
+          },
+          {
+            title:'C相电流上限',
+            align:"center",
+            dataIndex: 'currentCMax'
+          },
+          {
+            title:'C相电流下限',
+            align:"center",
+            dataIndex: 'currentCMin'
+          },
+          {
+            title:'C相电流报警（0正常1报警）',
+            align:"center",
+            dataIndex: 'currentCAlarm'
+          },
+          {
+            title:'创建时间',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/itdmWenxiangHistory/itdmWenxiangHistorySzh/list",
+          delete: "/itdmWenxiangHistory/itdmWenxiangHistorySzh/delete",
+          deleteBatch: "/itdmWenxiangHistory/itdmWenxiangHistorySzh/deleteBatch",
+          exportXlsUrl: "/itdmWenxiangHistory/itdmWenxiangHistorySzh/exportXls",
+          importExcelUrl: "itdmWenxiangHistory/itdmWenxiangHistorySzh/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:'deviceName',text:'设备名称',dictCode:''})
+        fieldList.push({type:'string',value:'deviceNo',text:'设备编号',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperature',text:'温度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMax',text:'温度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'temperatureMin',text:'温度下限',dictCode:''})
+        fieldList.push({type:'int',value:'temperatureAlarm',text:'温度报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidity',text:'湿度',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMax',text:'湿度上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'humidityMin',text:'湿度下限',dictCode:''})
+        fieldList.push({type:'int',value:'humidityAlarm',text:'湿度报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentA',text:'A相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMax',text:'A相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentAMin',text:'A相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentAAlarm',text:'A相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentB',text:'B相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMax',text:'B相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentBMin',text:'B相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentBAlarm',text:'B相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentC',text:'C相电流',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMax',text:'C相电流上限',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'currentCMin',text:'C相电流下限',dictCode:''})
+        fieldList.push({type:'int',value:'currentCAlarm',text:'C相电流报警（0正常1报警）',dictCode:''})
+        fieldList.push({type:'datetime',value:'createTime',text:'创建时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

itdmWeb/src/views/module-iTDM/itdmWenxiangHistory/modules/ItdmWenxiangHistory05Form.vue

@@ -0,0 +1,214 @@
+<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="deviceName">
+              <a-input v-model="model.deviceName" placeholder="请输入设备名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceNo">
+              <a-input v-model="model.deviceNo" placeholder="请输入设备编号"  ></a-input>
+            </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="temperatureMax">
+              <a-input-number v-model="model.temperatureMax" placeholder="请输入温度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureMin">
+              <a-input-number v-model="model.temperatureMin" placeholder="请输入温度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureAlarm">
+              <a-input-number v-model="model.temperatureAlarm" placeholder="请输入温度报警（0正常1报警）" 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="humidityMax">
+              <a-input-number v-model="model.humidityMax" placeholder="请输入湿度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityMin">
+              <a-input-number v-model="model.humidityMin" placeholder="请输入湿度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityAlarm">
+              <a-input-number v-model="model.humidityAlarm" placeholder="请输入湿度报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentA">
+              <a-input-number v-model="model.currentA" placeholder="请输入A相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMax">
+              <a-input-number v-model="model.currentAMax" placeholder="请输入A相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMin">
+              <a-input-number v-model="model.currentAMin" placeholder="请输入A相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAAlarm">
+              <a-input-number v-model="model.currentAAlarm" placeholder="请输入A相电流报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentB">
+              <a-input-number v-model="model.currentB" placeholder="请输入B相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMax">
+              <a-input-number v-model="model.currentBMax" placeholder="请输入B相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMin">
+              <a-input-number v-model="model.currentBMin" placeholder="请输入B相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBAlarm">
+              <a-input-number v-model="model.currentBAlarm" placeholder="请输入B相电流报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentC">
+              <a-input-number v-model="model.currentC" placeholder="请输入C相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMax">
+              <a-input-number v-model="model.currentCMax" placeholder="请输入C相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMin">
+              <a-input-number v-model="model.currentCMin" placeholder="请输入C相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCAlarm">
+              <a-input-number v-model="model.currentCAlarm" placeholder="请输入C相电流报警（0正常1报警）" 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: 'ItdmWenxiangHistory05Form',
+    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: "/itdmWenxiangHistory/itdmWenxiangHistory05/add",
+          edit: "/itdmWenxiangHistory/itdmWenxiangHistory05/edit",
+          queryById: "/itdmWenxiangHistory/itdmWenxiangHistory05/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/itdmWenxiangHistory/modules/ItdmWenxiangHistory05Modal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <itdm-wenxiang-history05-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></itdm-wenxiang-history05-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 ItdmWenxiangHistory05Form from './ItdmWenxiangHistory05Form'
+
+  export default {
+    name: 'ItdmWenxiangHistory05Modal',
+    components: {
+      ItdmWenxiangHistory05Form
+    },
+    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/itdmWenxiangHistory/modules/ItdmWenxiangHistory05Modal.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-wenxiang-history05-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-wenxiang-history05-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ItdmWenxiangHistory05Form from './ItdmWenxiangHistory05Form'
+  export default {
+    name: 'ItdmWenxiangHistory05Modal',
+    components: {
+      ItdmWenxiangHistory05Form
+    },
+    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/itdmWenxiangHistory/modules/ItdmWenxiangHistory16Form.vue

@@ -0,0 +1,219 @@
+<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="设备id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceId">
+              <a-input v-model="model.deviceId" placeholder="请输入设备id"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceName">
+              <a-input v-model="model.deviceName" placeholder="请输入设备名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceNo">
+              <a-input v-model="model.deviceNo" placeholder="请输入设备编号"  ></a-input>
+            </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="temperatureMax">
+              <a-input-number v-model="model.temperatureMax" placeholder="请输入温度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureMin">
+              <a-input-number v-model="model.temperatureMin" placeholder="请输入温度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureAlarm">
+              <a-input-number v-model="model.temperatureAlarm" placeholder="请输入温度报警（0正常1报警）" 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="humidityMax">
+              <a-input-number v-model="model.humidityMax" placeholder="请输入湿度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityMin">
+              <a-input-number v-model="model.humidityMin" placeholder="请输入湿度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityAlarm">
+              <a-input-number v-model="model.humidityAlarm" placeholder="请输入湿度报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentA">
+              <a-input-number v-model="model.currentA" placeholder="请输入A相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMax">
+              <a-input-number v-model="model.currentAMax" placeholder="请输入A相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMin">
+              <a-input-number v-model="model.currentAMin" placeholder="请输入A相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAAlarm">
+              <a-input-number v-model="model.currentAAlarm" placeholder="请输入A相电流报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentB">
+              <a-input-number v-model="model.currentB" placeholder="请输入B相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMax">
+              <a-input-number v-model="model.currentBMax" placeholder="请输入B相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMin">
+              <a-input-number v-model="model.currentBMin" placeholder="请输入B相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBAlarm">
+              <a-input-number v-model="model.currentBAlarm" placeholder="请输入B相电流报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentC">
+              <a-input-number v-model="model.currentC" placeholder="请输入C相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMax">
+              <a-input-number v-model="model.currentCMax" placeholder="请输入C相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMin">
+              <a-input-number v-model="model.currentCMin" placeholder="请输入C相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCAlarm">
+              <a-input-number v-model="model.currentCAlarm" placeholder="请输入C相电流报警（0正常1报警）" 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: 'ItdmWenxiangHistory16Form',
+    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: "/itdmWenxiangHistory/itdmWenxiangHistory16/add",
+          edit: "/itdmWenxiangHistory/itdmWenxiangHistory16/edit",
+          queryById: "/itdmWenxiangHistory/itdmWenxiangHistory16/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/itdmWenxiangHistory/modules/ItdmWenxiangHistory16Modal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <itdm-wenxiang-history16-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></itdm-wenxiang-history16-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 ItdmWenxiangHistory16Form from './ItdmWenxiangHistory16Form'
+
+  export default {
+    name: 'ItdmWenxiangHistory16Modal',
+    components: {
+      ItdmWenxiangHistory16Form
+    },
+    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/itdmWenxiangHistory/modules/ItdmWenxiangHistory16Modal.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-wenxiang-history16-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-wenxiang-history16-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ItdmWenxiangHistory16Form from './ItdmWenxiangHistory16Form'
+  export default {
+    name: 'ItdmWenxiangHistory16Modal',
+    components: {
+      ItdmWenxiangHistory16Form
+    },
+    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/itdmWenxiangHistory/modules/ItdmWenxiangHistory1Form.vue

@@ -0,0 +1,217 @@
+<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="deviceName">
+              <a-input v-model="model.deviceName" placeholder="请输入设备名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceNo">
+              <a-input v-model="model.deviceNo" placeholder="请输入设备编号"  ></a-input>
+            </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="temperatureMax">
+              <a-input-number v-model="model.temperatureMax" placeholder="请输入温度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureMin">
+              <a-input-number v-model="model.temperatureMin" placeholder="请输入温度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureAlarm">
+              <a-input-number v-model="model.temperatureAlarm" placeholder="请输入温度报警（0正常1报警）" dictCode="data_status" 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="humidityMax">
+              <a-input-number v-model="model.humidityMax" placeholder="请输入湿度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityMin">
+              <a-input-number v-model="model.humidityMin" placeholder="请输入湿度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityAlarm">
+              <a-input-number v-model="model.humidityAlarm" placeholder="请输入湿度报警（0正常1报警）" dictCode="data_status" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentA">
+              <a-input-number v-model="model.currentA" placeholder="请输入A相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMax">
+              <a-input-number v-model="model.currentAMax" placeholder="请输入A相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMin">
+              <a-input-number v-model="model.currentAMin" placeholder="请输入A相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAAlarm">
+              <a-input-number v-model="model.currentAAlarm" placeholder="请输入A相电流报警（0正常1报警）" dictCode="data_status" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentB">
+              <a-input-number v-model="model.currentB" placeholder="请输入B相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMax">
+              <a-input-number v-model="model.currentBMax" placeholder="请输入B相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMin">
+              <a-input-number v-model="model.currentBMin" placeholder="请输入B相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBAlarm">
+              <a-input-number v-model="model.currentBAlarm" placeholder="请输入B相电流报警（0正常1报警）" dictCode="data_status" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentC">
+              <a-input-number v-model="model.currentC" placeholder="请输入C相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMax">
+              <a-input-number v-model="model.currentCMax" placeholder="请输入C相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMin">
+              <a-input-number v-model="model.currentCMin" placeholder="请输入C相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCAlarm">
+              <a-input-number v-model="model.currentCAlarm" placeholder="请输入C相电流报警（0正常1报警）" dictCode="data_status" 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: 'ItdmWenxiangHistory1Form',
+    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: {
+           createTime: [
+              { required: true, message: '请输入创建时间!'},
+           ],
+        },
+        url: {
+          add: "/itdmWenxiangHistory/itdmWenxiangHistory1/add",
+          edit: "/itdmWenxiangHistory/itdmWenxiangHistory1/edit",
+          queryById: "/itdmWenxiangHistory/itdmWenxiangHistory1/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/itdmWenxiangHistory/modules/ItdmWenxiangHistory1Modal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <itdm-wenxiang-history1-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></itdm-wenxiang-history1-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 ItdmWenxiangHistory1Form from './ItdmWenxiangHistory1Form'
+
+  export default {
+    name: 'ItdmWenxiangHistory1Modal',
+    components: {
+      ItdmWenxiangHistory1Form
+    },
+    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/itdmWenxiangHistory/modules/ItdmWenxiangHistory1Modal.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-wenxiang-history1-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-wenxiang-history1-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ItdmWenxiangHistory1Form from './ItdmWenxiangHistory1Form'
+  export default {
+    name: 'ItdmWenxiangHistory1Modal',
+    components: {
+      ItdmWenxiangHistory1Form
+    },
+    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/itdmWenxiangHistory/modules/ItdmWenxiangHistory48Form.vue

@@ -0,0 +1,214 @@
+<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="deviceName">
+              <a-input v-model="model.deviceName" placeholder="请输入设备名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceNo">
+              <a-input v-model="model.deviceNo" placeholder="请输入设备编号"  ></a-input>
+            </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="temperatureMax">
+              <a-input-number v-model="model.temperatureMax" placeholder="请输入温度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureMin">
+              <a-input-number v-model="model.temperatureMin" placeholder="请输入温度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureAlarm">
+              <a-input-number v-model="model.temperatureAlarm" placeholder="请输入温度报警（0正常1报警）" 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="humidityMax">
+              <a-input-number v-model="model.humidityMax" placeholder="请输入湿度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityMin">
+              <a-input-number v-model="model.humidityMin" placeholder="请输入湿度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityAlarm">
+              <a-input-number v-model="model.humidityAlarm" placeholder="请输入湿度报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentA">
+              <a-input-number v-model="model.currentA" placeholder="请输入A相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMax">
+              <a-input-number v-model="model.currentAMax" placeholder="请输入A相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMin">
+              <a-input-number v-model="model.currentAMin" placeholder="请输入A相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAAlarm">
+              <a-input-number v-model="model.currentAAlarm" placeholder="请输入A相电流报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentB">
+              <a-input-number v-model="model.currentB" placeholder="请输入B相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMax">
+              <a-input-number v-model="model.currentBMax" placeholder="请输入B相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMin">
+              <a-input-number v-model="model.currentBMin" placeholder="请输入B相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBAlarm">
+              <a-input-number v-model="model.currentBAlarm" placeholder="请输入B相电流报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentC">
+              <a-input-number v-model="model.currentC" placeholder="请输入C相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMax">
+              <a-input-number v-model="model.currentCMax" placeholder="请输入C相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMin">
+              <a-input-number v-model="model.currentCMin" placeholder="请输入C相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCAlarm">
+              <a-input-number v-model="model.currentCAlarm" placeholder="请输入C相电流报警（0正常1报警）" 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: 'ItdmWenxiangHistory48Form',
+    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: "/itdmWenxiangHistory/itdmWenxiangHistory48/add",
+          edit: "/itdmWenxiangHistory/itdmWenxiangHistory48/edit",
+          queryById: "/itdmWenxiangHistory/itdmWenxiangHistory48/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/itdmWenxiangHistory/modules/ItdmWenxiangHistory48Modal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <itdm-wenxiang-history48-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></itdm-wenxiang-history48-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 ItdmWenxiangHistory48Form from './ItdmWenxiangHistory48Form'
+
+  export default {
+    name: 'ItdmWenxiangHistory48Modal',
+    components: {
+      ItdmWenxiangHistory48Form
+    },
+    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/itdmWenxiangHistory/modules/ItdmWenxiangHistory48Modal.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-wenxiang-history48-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-wenxiang-history48-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ItdmWenxiangHistory48Form from './ItdmWenxiangHistory48Form'
+  export default {
+    name: 'ItdmWenxiangHistory48Modal',
+    components: {
+      ItdmWenxiangHistory48Form
+    },
+    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/itdmWenxiangHistory/modules/ItdmWenxiangHistory8Form.vue

@@ -0,0 +1,214 @@
+<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="deviceName">
+              <a-input v-model="model.deviceName" placeholder="请输入设备名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceNo">
+              <a-input v-model="model.deviceNo" placeholder="请输入设备编号"  ></a-input>
+            </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="temperatureMax">
+              <a-input-number v-model="model.temperatureMax" placeholder="请输入温度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureMin">
+              <a-input-number v-model="model.temperatureMin" placeholder="请输入温度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureAlarm">
+              <a-input-number v-model="model.temperatureAlarm" placeholder="请输入温度报警（0正常1报警）" 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="humidityMax">
+              <a-input-number v-model="model.humidityMax" placeholder="请输入湿度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityMin">
+              <a-input-number v-model="model.humidityMin" placeholder="请输入湿度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityAlarm">
+              <a-input-number v-model="model.humidityAlarm" placeholder="请输入湿度报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentA">
+              <a-input-number v-model="model.currentA" placeholder="请输入A相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMax">
+              <a-input-number v-model="model.currentAMax" placeholder="请输入A相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMin">
+              <a-input-number v-model="model.currentAMin" placeholder="请输入A相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAAlarm">
+              <a-input-number v-model="model.currentAAlarm" placeholder="请输入A相电流报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentB">
+              <a-input-number v-model="model.currentB" placeholder="请输入B相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMax">
+              <a-input-number v-model="model.currentBMax" placeholder="请输入B相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMin">
+              <a-input-number v-model="model.currentBMin" placeholder="请输入B相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBAlarm">
+              <a-input-number v-model="model.currentBAlarm" placeholder="请输入B相电流报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentC">
+              <a-input-number v-model="model.currentC" placeholder="请输入C相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMax">
+              <a-input-number v-model="model.currentCMax" placeholder="请输入C相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMin">
+              <a-input-number v-model="model.currentCMin" placeholder="请输入C相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCAlarm">
+              <a-input-number v-model="model.currentCAlarm" placeholder="请输入C相电流报警（0正常1报警）" 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: 'ItdmWenxiangHistory8Form',
+    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: "/itdmWenxiangHistory/itdmWenxiangHistory8/add",
+          edit: "/itdmWenxiangHistory/itdmWenxiangHistory8/edit",
+          queryById: "/itdmWenxiangHistory/itdmWenxiangHistory8/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/itdmWenxiangHistory/modules/ItdmWenxiangHistory8Modal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <itdm-wenxiang-history8-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></itdm-wenxiang-history8-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 ItdmWenxiangHistory8Form from './ItdmWenxiangHistory8Form'
+
+  export default {
+    name: 'ItdmWenxiangHistory8Modal',
+    components: {
+      ItdmWenxiangHistory8Form
+    },
+    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/itdmWenxiangHistory/modules/ItdmWenxiangHistory8Modal.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-wenxiang-history8-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-wenxiang-history8-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ItdmWenxiangHistory8Form from './ItdmWenxiangHistory8Form'
+  export default {
+    name: 'ItdmWenxiangHistory8Modal',
+    components: {
+      ItdmWenxiangHistory8Form
+    },
+    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/itdmWenxiangHistory/modules/ItdmWenxiangHistoryMjForm.vue

@@ -0,0 +1,214 @@
+<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="deviceName">
+              <a-input v-model="model.deviceName" placeholder="请输入设备名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceNo">
+              <a-input v-model="model.deviceNo" placeholder="请输入设备编号"  ></a-input>
+            </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="temperatureMax">
+              <a-input-number v-model="model.temperatureMax" placeholder="请输入温度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureMin">
+              <a-input-number v-model="model.temperatureMin" placeholder="请输入温度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureAlarm">
+              <a-input-number v-model="model.temperatureAlarm" placeholder="请输入温度报警（0正常1报警）" 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="humidityMax">
+              <a-input-number v-model="model.humidityMax" placeholder="请输入湿度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityMin">
+              <a-input-number v-model="model.humidityMin" placeholder="请输入湿度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityAlarm">
+              <a-input-number v-model="model.humidityAlarm" placeholder="请输入湿度报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentA">
+              <a-input-number v-model="model.currentA" placeholder="请输入A相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMax">
+              <a-input-number v-model="model.currentAMax" placeholder="请输入A相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMin">
+              <a-input-number v-model="model.currentAMin" placeholder="请输入A相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAAlarm">
+              <a-input-number v-model="model.currentAAlarm" placeholder="请输入A相电流报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentB">
+              <a-input-number v-model="model.currentB" placeholder="请输入B相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMax">
+              <a-input-number v-model="model.currentBMax" placeholder="请输入B相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMin">
+              <a-input-number v-model="model.currentBMin" placeholder="请输入B相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBAlarm">
+              <a-input-number v-model="model.currentBAlarm" placeholder="请输入B相电流报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentC">
+              <a-input-number v-model="model.currentC" placeholder="请输入C相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMax">
+              <a-input-number v-model="model.currentCMax" placeholder="请输入C相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMin">
+              <a-input-number v-model="model.currentCMin" placeholder="请输入C相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCAlarm">
+              <a-input-number v-model="model.currentCAlarm" placeholder="请输入C相电流报警（0正常1报警）" 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: 'ItdmWenxiangHistoryMjForm',
+    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: "/itdmWenxiangHistory/itdmWenxiangHistoryMj/add",
+          edit: "/itdmWenxiangHistory/itdmWenxiangHistoryMj/edit",
+          queryById: "/itdmWenxiangHistory/itdmWenxiangHistoryMj/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/itdmWenxiangHistory/modules/ItdmWenxiangHistoryMjModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <itdm-wenxiang-history-mj-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></itdm-wenxiang-history-mj-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 ItdmWenxiangHistoryMjForm from './ItdmWenxiangHistoryMjForm'
+
+  export default {
+    name: 'ItdmWenxiangHistoryMjModal',
+    components: {
+      ItdmWenxiangHistoryMjForm
+    },
+    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/itdmWenxiangHistory/modules/ItdmWenxiangHistoryMjModal.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-wenxiang-history-mj-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-wenxiang-history-mj-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ItdmWenxiangHistoryMjForm from './ItdmWenxiangHistoryMjForm'
+  export default {
+    name: 'ItdmWenxiangHistoryMjModal',
+    components: {
+      ItdmWenxiangHistoryMjForm
+    },
+    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/itdmWenxiangHistory/modules/ItdmWenxiangHistorySzhForm.vue

@@ -0,0 +1,214 @@
+<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="deviceName">
+              <a-input v-model="model.deviceName" placeholder="请输入设备名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceNo">
+              <a-input v-model="model.deviceNo" placeholder="请输入设备编号"  ></a-input>
+            </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="temperatureMax">
+              <a-input-number v-model="model.temperatureMax" placeholder="请输入温度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureMin">
+              <a-input-number v-model="model.temperatureMin" placeholder="请输入温度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="温度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="temperatureAlarm">
+              <a-input-number v-model="model.temperatureAlarm" placeholder="请输入温度报警（0正常1报警）" 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="humidityMax">
+              <a-input-number v-model="model.humidityMax" placeholder="请输入湿度上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityMin">
+              <a-input-number v-model="model.humidityMin" placeholder="请输入湿度下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="湿度报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="humidityAlarm">
+              <a-input-number v-model="model.humidityAlarm" placeholder="请输入湿度报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentA">
+              <a-input-number v-model="model.currentA" placeholder="请输入A相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMax">
+              <a-input-number v-model="model.currentAMax" placeholder="请输入A相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAMin">
+              <a-input-number v-model="model.currentAMin" placeholder="请输入A相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="A相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentAAlarm">
+              <a-input-number v-model="model.currentAAlarm" placeholder="请输入A相电流报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentB">
+              <a-input-number v-model="model.currentB" placeholder="请输入B相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMax">
+              <a-input-number v-model="model.currentBMax" placeholder="请输入B相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBMin">
+              <a-input-number v-model="model.currentBMin" placeholder="请输入B相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="B相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentBAlarm">
+              <a-input-number v-model="model.currentBAlarm" placeholder="请输入B相电流报警（0正常1报警）" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentC">
+              <a-input-number v-model="model.currentC" placeholder="请输入C相电流" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流上限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMax">
+              <a-input-number v-model="model.currentCMax" placeholder="请输入C相电流上限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流下限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCMin">
+              <a-input-number v-model="model.currentCMin" placeholder="请输入C相电流下限" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="C相电流报警（0正常1报警）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="currentCAlarm">
+              <a-input-number v-model="model.currentCAlarm" placeholder="请输入C相电流报警（0正常1报警）" 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: 'ItdmWenxiangHistorySzhForm',
+    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: "/itdmWenxiangHistory/itdmWenxiangHistorySzh/add",
+          edit: "/itdmWenxiangHistory/itdmWenxiangHistorySzh/edit",
+          queryById: "/itdmWenxiangHistory/itdmWenxiangHistorySzh/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/itdmWenxiangHistory/modules/ItdmWenxiangHistorySzhModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <itdm-wenxiang-history-szh-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></itdm-wenxiang-history-szh-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 ItdmWenxiangHistorySzhForm from './ItdmWenxiangHistorySzhForm'
+
+  export default {
+    name: 'ItdmWenxiangHistorySzhModal',
+    components: {
+      ItdmWenxiangHistorySzhForm
+    },
+    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/itdmWenxiangHistory/modules/ItdmWenxiangHistorySzhModal.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-wenxiang-history-szh-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></itdm-wenxiang-history-szh-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ItdmWenxiangHistorySzhForm from './ItdmWenxiangHistorySzhForm'
+  export default {
+    name: 'ItdmWenxiangHistorySzhModal',
+    components: {
+      ItdmWenxiangHistorySzhForm
+    },
+    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/itdmYeWu/itdmGcShishi.vue

@@ -2,33 +2,56 @@
   <div>
     <div class="head">第三部分　项目过程实施</div>
     <table class="main-table">
-      <tr>
-        <td class="title" style="width: 100px">姓名</td>
-        <td class="content" style="width: 540px" colspan="2">
-          <div style="width: 540px"></div>
+      <tr v-for="(item, index) in tableData.assessmentLog" :key="index">
+        <!-- <td :rowspan="12" style="width: 80px">项目成员<br/>考核日志</td> -->
+        <td class="title" style="width: 100px">
+          <div>{{ tableData.assessmentLog.length }}</div>
+          <input v-model="item.name" style="width: 80px;text-align: center" />
         </td>
-        <td class="content" style="width: 450px">量化积分
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+        <td class="content" colspan="3">
+          <table>
+            <thead>
+              <td style="width: 80px;">序号</td>
+              <td style="width: 80px;">日期</td>
+              <td style="width: 80px;">工时</td>
+              <td style="width: 80px;">强度</td>
+              <td style="width: 80px;">工作量</td>
+              <td style="width: 80px;">告知数</td>
+              <td style="width: 80px;">差错数</td>
+              <td style="width: 80px;">催促数</td>
+              <td style="width: 80px;">警告数</td>
+              <!-- <td style="width: 60px">操作</td> -->
+            </thead>
+            <tr>
+              <td>1</td>
+              <td><input style="width: 80px;" v-model="item.resultData.date" /></td>
+              <td><input style="width: 80px;" v-model="item.resultData.gongshi" /></td>
+              <td><input style="width: 80px;" v-model="item.resultData.qiangdu" /></td>
+              <td><input style="width: 80px;" v-model="item.resultData.gongzuoliang" /></td>
+              <td><input style="width: 80px;" v-model="item.resultData.gaozhiNum" /></td>
+              <td><input style="width: 80px;" v-model="item.resultData.chacuoNum" /></td>
+              <td><input style="width: 80px;" v-model="item.resultData.cuicuNum" /></td>
+              <td><input style="width: 80px;" v-model="item.resultData.jinggaoNum" /></td>
+              <!-- <td><div class="delBtn" @click="delRow(index)" v-show="tableData.cleanPrice.length >= 2">删除</div></td> -->
+            </tr>
+          </table>
         </td>
+        <td class="content" style="width: 100px">量化积分</td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">非考核支持人员</td>
-        <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+        <td class="title" style="width: 80px">非考核<br/>支持人员</td>
+        <td class="content" style="width: 100px">
         </td>
-        <td class="title white" style="width: 100px">项目成员 考核汇总</td>
-        <td class="content" style="width: 450px">
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+        <td class="title white" style="width: 80px">项目成员<br/>考核汇总</td>
+        <td class="content" style="width: 100px" colspan="2">
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">项目完工申请</td>
-        <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+        <td class="title" style="width: 80px">项目完工<br/>申请</td>
+        <td class="content" style="width: 100px">
         </td>
-        <td class="title white" style="width: 100px">提交人</td>
-        <td class="content" style="width: 450px">
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+        <td class="title white" style="width: 80px">提交人</td>
+        <td class="content" style="width: 100px" colspan="2">
         </td>
       </tr>
     </table>
@@ -37,18 +60,16 @@
 
 <script>
 export default {
-    name: 'itdmGcShishi',
-    data() {
-        return {
-            tableData: {
-              cleanPrice: [
-                {
-                  total: 0,
-                },
-              ],
-            },
-        }
-    },
+  name: 'itdmGcShishi',
+  data() {
+    return {
+      tableData: {
+        assessmentLog: [
+          { name: '', resultData: {} }
+        ]
+      },
+    }
+  },
 }
 </script>
 

itdmWeb/src/views/module-iTDM/itdmYeWu/itdmXnJiesuan.vue

@@ -3,123 +3,132 @@
     <div class="head">第五部分　试验虚拟结算</div>
     <table class="main-table">
       <tr>
-        <td class="title" style="width: 100px">核准 虚拟结算额</td>
+        <td rowspan="6" style="width: 100px">市场部<br/>核准</td>
+        <td class="title" style="width: 100px">核准<br/>虚拟结算额</td>
         <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+          <div>
+            <div v-for="(item, index) in tableData.xnJiesuanE" :key="index">{{ item.name }}：{{ item.amount }}；</div>
+          </div>
         </td>
-        <td class="title white" style="width: 100px">核准 虚拟结算毛利</td>
-        <td class="content" style="width: 450px">
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+        <td class="title white" style="width: 100px">核准<br/>虚拟结算毛利</td>
+        <td class="content">
+          <!-- <input v-model="tableData.xnMaoli" style="text-align: center" /> -->
+          <div>
+            <div v-for="(item, index) in tableData.xnJiesuanE" :key="index">{{ item.name }}：{{ item.amount * 0.8 }}；</div>
+          </div>
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">核准 合同总额</td>
+        <td class="title" style="width: 100px">核准<br/>合同总额</td>
         <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+          <input v-model="tableData.hetongZonge" style="text-align: center" />
         </td>
-        <td class="title white" style="width: 100px">核准 外协外购</td>
-        <td class="content" style="width: 450px">
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+        <td class="title white" style="width: 100px">核准<br/>外协外购</td>
+        <td class="content" style="width: 350px">
+          <input v-model="tableData.waixieWaigou" style="text-align: center" />
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">销售提成 基数</td>
+        <td class="title" style="width: 100px">销售提成<br/>基数</td>
         <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+          
         </td>
         <td class="title white" style="width: 100px">项目满意度</td>
-        <td class="content" style="width: 450px">
+        <td class="content" style="width: 350px">
           <input v-model="tableData.shuruLeixing" style="text-align: center" />
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">项目计算标准</td>
+        <td class="title" style="width: 100px">项目计算<br/>标准</td>
         <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+          <div>
+            <div>虚拟结算量化标准</div>
+            <div>0-5万：5%</div>
+            <div>5-10万：4%</div>
+            <div>10-50万：3%</div>
+            <div>50万以上：2%</div>
+          </div>
         </td>
-        <td class="title white" style="width: 100px">项目绩效 基数计算</td>
-        <td class="content" style="width: 450px">
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+        <td class="title white" style="width: 100px">项目绩效<br/>基数计算</td>
+        <td class="content" style="width: 350px">
+          <el-table :data="jixiaoData" style="width: 100%">
+            <el-table-column type="index" label="序号"></el-table-column>
+            <!-- <el-table-column prop="type" label="试验类型"></el-table-column> -->
+            <el-table-column prop="name" label="试验类型"></el-table-column>
+            <el-table-column prop="fenduan" label="合同分段"></el-table-column>
+            <el-table-column prop="bili" label="分段比例"></el-table-column>
+            <el-table-column prop="ticheng" label="分段提成"></el-table-column>
+            <el-table-column prop="yue" label="分段余额"></el-table-column>
+          </el-table>
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">项目得分（百分制）</td>
+        <td class="title" style="width: 100px">项目得分<br/>（百分制）</td>
         <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+          <!-- <itdm-device-run-list></itdm-device-run-list> -->
         </td>
         <!-- <td class="content" style="width: 100px" colspan="2"></td> -->
-        <td class="title white" style="width: 100px">虚拟结算 绩效总额</td>
-        <td class="content" style="width: 450px">
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+        <td class="title white" style="width: 100px">虚拟结算<br/>绩效总额</td>
+        <td class="content" style="width: 350px">
+          <div v-for="(item, index) in jixiaoZonge" :key="index">{{ item }}</div>
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">
-            <div>市场部核准</div>
-            <div>核准结论</div>
-        </td>
+        <td class="title" style="width: 100px">核准结论</td>
         <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+          <div></div>
         </td>
         <!-- <td class="content" style="width: 100px" colspan="2"></td> -->
         <td class="title white" style="width: 100px">核准人	</td>
-        <td class="content" style="width: 450px">
+        <td class="content" style="width: 350px">
           <input v-model="tableData.shuruLeixing" style="text-align: center" />
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">
-            <div>工程技术部核准</div>
-            <div>核准结论</div>
-        </td>
+        <td class="title" style="width: 100px; background-color: #E5E0EC;">工程技术部<br/>核准</td>
+        <td class="title" style="width: 100px">核准结论</td>
         <td class="content" style="width: 360px; background-color: #E5E0EC;">
-          <div style="width: 440px"></div>
+          <div></div>
         </td>
         <!-- <td class="content" style="width: 100px" colspan="2"></td> -->
         <td class="title white" style="width: 100px">核准人	</td>
-        <td class="content" style="width: 450px; background-color: #E5E0EC;">
+        <td class="content" style="width: 350px; background-color: #E5E0EC;">
           <input v-model="tableData.shuruLeixing" style="text-align: center" />
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">
-            <div>财务部核准</div>
-            <div>核准结论</div>
-        </td>
+        <td class="title" style="width: 100px; background-color: #F2DCDB;">财务部<br/>核准</td>
+        <td class="title" style="width: 100px">核准结论</td>
         <td class="content" style="width: 360px; background-color: #F2DCDB;">
-          <div style="width: 440px"></div>
+          <div></div>
         </td>
         <!-- <td class="content" style="width: 100px" colspan="2"></td> -->
         <td class="title white" style="width: 100px">核准人	</td>
-        <td class="content" style="width: 450px; background-color: #F2DCDB;">
+        <td class="content" style="width: 350px; background-color: #F2DCDB;">
           <input v-model="tableData.shuruLeixing" style="text-align: center" />
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">
-            <div>总经理审批</div>
-            <div>批准结论</div>
-        </td>
+        <td class="title" style="width: 100px; background-color: #E5B9B7;">总经理审批</td>
+        <td class="title" style="width: 100px">批准结论</td>
         <td class="content" style="width: 360px; background-color: #E5B9B7;">
-          <div style="width: 440px"></div>
+          <div></div>
         </td>
         <!-- <td class="content" style="width: 100px" colspan="2"></td> -->
         <td class="title white" style="width: 100px">总经理	</td>
-        <td class="content" style="width: 450px; background-color: #E5B9B7;">
+        <td class="content" style="width: 350px; background-color: #E5B9B7;">
           <input v-model="tableData.shuruLeixing" style="text-align: center" />
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">
-            <div>归档</div>
-            <div>合同信息</div>
-        </td>
+        <td class="title" style="width: 100px; background-color: #DBEEF3;">归档</td>
+        <td class="title" style="width: 100px">合同信息</td>
         <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+          <div></div>
         </td>
         <!-- <td class="content" style="width: 100px" colspan="2"></td> -->
         <td class="title white" style="width: 100px">核准人	</td>
-        <td class="content" style="width: 450px">
+        <td class="content" style="width: 350px">
           <input v-model="tableData.shuruLeixing" style="text-align: center" />
         </td>
       </tr>
@@ -129,18 +138,183 @@
 
 <script>
 export default {
-    name: 'itdmXnJiesuan',
-    data() {
-        return {
-            tableData: {
-              cleanPrice: [
-                {
-                  total: 0,
-                },
-              ],
+  name: 'itdmXnJiesuan',
+  data() {
+    return {
+      tableData: {
+        xnJiesuanE: [
+          { type: 0, name: '气候试验', amount: 50000 },
+          { type: 1, name: '力学试验', amount: 510000 },
+          { type: 2, name: '重要/非标试验', amount: 100000 },
+        ],
+        jixiaoData: [],
+        jixiaoZonge: null
+      },
+    }
+  },
+  computed: {
+    jixiaoData(){
+      var dataLists = []
+      for (let i = 0; i < this.tableData.xnJiesuanE.length; i++) {
+        const item = this.tableData.xnJiesuanE[i];
+        const money = item.amount * 0.8
+        if(money > 500000){
+          // 50万以上
+          console.log(money+':50万以上')
+          var arr = [
+            {
+              type: item.type,
+              name: item.name,
+              fenduan: item.fenduan,
+              bili: 0.05,
+              ticheng: 50000 * 0.05,
+              yue: 50000
+            },
+            {
+              type: item.type,
+              name: item.name,
+              fenduan: item.fenduan,
+              bili: 0.04,
+              ticheng: 50000 * 0.04,
+              yue: 50000
             },
+            {
+              type: item.type,
+              name: item.name,
+              fenduan: item.fenduan,
+              bili: 0.03,
+              ticheng: 400000 * 0.03,
+              yue: 400000
+            },
+            {
+              type: item.type,
+              name: item.name,
+              fenduan: item.fenduan,
+              bili: 0.02,
+              ticheng: (money - 500000) * 0.02,
+              yue: money - 500000
+            },
+          ]
+          dataLists.push(...arr)
+        } else if (money > 100000){
+          // 10万-50万之间
+          console.log(money+':10万-50万之间')
+          var arr = [
+            {
+              type: item.type,
+              name: item.name,
+              fenduan: item.fenduan,
+              bili: 0.05,
+              ticheng: 50000 * 0.05,
+              yue: 50000
+            },
+            {
+              type: item.type,
+              name: item.name,
+              fenduan: item.fenduan,
+              bili: 0.04,
+              ticheng: 50000 * 0.04,
+              yue: 50000
+            },
+            {
+              type: item.type,
+              name: item.name,
+              fenduan: item.fenduan,
+              bili: 0.03,
+              ticheng: (money - 100000) * 0.03,
+              yue: money - 100000
+            },
+          ]
+          dataLists.push(...arr)
+        } else if (money > 50000){
+          // 5万-10万（包含）之间
+          console.log(money+':5万-10万（包含）之间')
+          var arr = [
+            {
+              type: item.type,
+              name: item.name,
+              fenduan: item.fenduan,
+              bili: 0.05,
+              ticheng: 50000 * 0.05,
+              yue: 50000
+            },
+            {
+              type: item.type,
+              name: item.name,
+              fenduan: item.fenduan,
+              bili: 0.04,
+              ticheng: (money - 50000) * 0.04,
+              yue: money - 50000
+            },
+          ]
+          dataLists.push(...arr)
+        } else if (money >= 0){
+          // 0-5万（包含）之间
+          console.log(money+':0-5万（包含）之间')
+          var arr = [
+            {
+              type: item.type,
+              name: item.name,
+              fenduan: item.fenduan,
+              bili: 0.05,
+              ticheng: money * 0.05,
+              yue: money
+            },
+          ]
+          dataLists.push(...arr)
         }
+      }
+      return dataLists
     },
+    jixiaoZonge(){
+      console.log(this.jixiaoData)
+      
+      let totalArr = []
+      let total = 0
+
+      var arr0 = this.jixiaoData.filter(res => res.type === 0)
+      var arr1 = this.jixiaoData.filter(res => res.type === 1)
+      var arr2 = this.jixiaoData.filter(res => res.type === 2)
+      
+      // 默认传如一个参数0，prev的第一项就是0，每次加上下一次的价格即可
+      let total0 = 0
+      let total1 = 0
+      let total2 = 0
+      if(arr0.length > 0){
+        var d = arr0.reduce((prev, next) => {
+          console.log(prev, next)
+          return prev + next.ticheng
+        }, 0)
+        total0 = d * 0.4
+        totalArr.push(`气候试验：${total0}；`)
+        total = total + total0
+      }
+      if(arr1.length > 0){
+        var d = arr1.reduce((prev, next) => {
+          console.log(prev, next)
+          return prev + next.ticheng
+        }, 0)
+        total1 = d * 0.7
+        totalArr.push(`力学试验：${total1}；`)
+        total = total + total1
+      }
+      if(arr2.length > 0){
+        var d = arr2.reduce((prev, next) => {
+          console.log(prev, next)
+          return prev + next.ticheng
+        }, 0)
+        total2 = d * 1
+        totalArr.push(`重要/非标试验：${total2}；`)
+        total = total + total2
+      }
+      totalArr.push(`总计：${total}；`)
+      // console.log(total)
+      return totalArr
+    }
+  },
+  methods: {
+    
+  },
 }
 </script>
 

itdmWeb/src/views/user/firstIndex.vue

@@ -39,7 +39,9 @@
         // console.log(this.$refs)
         // 获取图片宽高和top以及left
         var systemWidth = this.$refs.systemContent.offsetWidth
-        var systemHeight = this.$refs.systemContent.offsetHeight
+        // var systemHeight = this.$refs.systemContent.offsetHeight
+        // 因为高度是动态的，所以初始化可能会出现获取不到高度的情况
+        var systemHeight = systemWidth * (700/1476)
         var systemTop = this.$refs.systemContent.offsetTop
         var systemLeft = this.$refs.systemContent.offsetLeft
         // console.log(systemWidth, systemHeight, systemTop, systemLeft)