diff --git a/ant-design-vue/src/views/ttwaterwayfid/TtWaterwayFidList.vue b/ant-design-vue/src/views/ttwaterwayfid/TtWaterwayFidList.vue
index 03961e2..373c576 100644
--- a/ant-design-vue/src/views/ttwaterwayfid/TtWaterwayFidList.vue
+++ b/ant-design-vue/src/views/ttwaterwayfid/TtWaterwayFidList.vue
@@ -5,8 +5,8 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="型号表编号">
-              <a-input placeholder="请输入型号表编号" v-model="queryParam.typeid"></a-input>
+            <a-form-item label="FID">
+              <a-input placeholder="请输入Fid" v-model="queryParam.fid"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="10" :lg="11" :md="12" :sm="24">
diff --git a/ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterRecordsList.vue b/ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterRecordsList.vue
new file mode 100644
index 0000000..ff46cf8
--- /dev/null
+++ b/ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterRecordsList.vue
@@ -0,0 +1,262 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="FID">
+              <a-input placeholder="请输入FID" v-model="queryParam.fid"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="10" :lg="11" :md="12" :sm="24">
+            <a-form-item label="入水时间">
+              <j-date placeholder="请选择开始时间" class="query-group-cust" :showTime="true"  dateFormat="YYYY-MM-DD HH:mm:ss" 
+              v-model="queryParam.water_enter_begin"></j-date>
+              <span class="query-group-split-cust"></span>
+              <j-date placeholder="请选择结束时间" class="query-group-cust" :showTime="true"  dateFormat="YYYY-MM-DD HH:mm:ss"  
+              v-model="queryParam.water_enter_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>
+
+
+    <!-- 操作按钮区域 -->
+    <!-- <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <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"
+        bordered
+        rowKey="id"
+        filterMultiple="filterMultiple"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:type}"
+        @change="handleTableChange"
+        :customRow="clickThenCheck"
+      >
+
+        <!-- <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical"/>
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span> -->
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <a-tabs defaultActiveKey="1">
+      <a-tab-pane tab="入水温度" key="1">
+        <TtxhWaterTempParamList ref="EnterTempParam"></TtxhWaterTempParamList>
+      </a-tab-pane>
+      <a-tab-pane tab="预热温度" key="2" forceRender>
+        <TtxhWaterTempParamList ref="YureTempParam"></TtxhWaterTempParamList>
+      </a-tab-pane>
+      <a-tab-pane tab="出水温度" key="3" forceRender>
+        <TtxhWaterTempParamList ref="OutTempParam"></TtxhWaterTempParamList>
+      </a-tab-pane>
+    </a-tabs>
+
+
+  </a-card>
+</template>
+
+<script>
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+  import TtWaterwayCollectModal from '../ttwaterwaycollect/modules/TtWaterwayCollectModal'
+  import TtxhWaterTempParamList from './ttxhWaterTempParamList'
+  
+
+  export default {
+    name: "JeecgOrderDMainList",
+    mixins: [JeecgListMixin],
+    components: {
+      TtWaterwayCollectModal,
+      TtxhWaterTempParamList
+    },
+    data() {
+      return {
+        description: '出入水记录管理',
+        /* 分页参数 */
+        ipagination:{
+          current: 1,
+          pageSize: 5,
+          pageSizeOptions: ['5', '10', '20'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        // 表头
+        columns: [
+          {
+            title: 'FID',
+            align: "center",
+            dataIndex: 'fid'
+          },
+          {
+            title: '批次号',
+            align: "center",
+            dataIndex: 'batchNumber'
+          },
+          {
+            title: '框号',
+            align: "center",
+            dataIndex: 'number'
+          },
+          {
+            title: '绑定时间',
+            align: "center",
+            dataIndex: 'bindTime'
+          },
+          {
+            title: '产品名称',
+            align: "center",
+            dataIndex: 'proName'
+          },
+          {
+            title: '型号',
+            align: "center",
+            dataIndex: 'typeNo'
+          },
+          {
+            title: '入水时间',
+            align: "center",
+            dataIndex: 'typeNo'
+          },
+          {
+            title: '预热时间',
+            align: "center",
+            dataIndex: 'typeNo'
+          },
+          {
+            title: '出水时间',
+            align: "center",
+            dataIndex: 'outTime'
+          }],
+        // 单选记录
+        type: "radio",
+        url: { 
+          list: "/ttwaterwayoutenter/ttWaterwayOutenter/list",
+        },
+      }
+    },
+    methods: {
+      clickThenCheck(record) {
+        return {
+          on: {
+            click: () => {
+              this.onSelectChange(record.id.split(","), [record]);
+            }
+          }
+        };
+      },
+      onSelectChange(selectedRowKeys, selectionRows) {
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+        this.$refs.EnterTempParam.getTempInfo(this.selectedRowKeys[0]);
+        this.$refs.YureTempParam.getTempInfo(this.selectedRowKeys[0]);
+        this.$refs.OutTempParam.getTempInfo(this.selectedRowKeys[0]);
+      },
+      onClearSelected() {
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+        this.$refs.EnterTempParam.queryParam.mainId = null;
+        this.$refs.YureTempParam.queryParam.mainId = null;
+        this.$refs.OutTempParam.queryParam.mainId = null;
+        this.$refs.EnterTempParam.loadInfo();
+        this.$refs.YureTempParam.loadInfo();
+        this.$refs.OutTempParam.loadInfo();
+        this.$refs.EnterTempParam.selectionRows = [];
+        this.$refs.YureTempParam.selectedRowKeys = [];
+        this.$refs.OutTempParam.selectionRows = [];
+      },
+      searchQuery:function(){
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+        this.$refs.EnterTempParam.queryParam.mainId = null;
+        this.$refs.YureTempParam.queryParam.mainId = null;
+        this.$refs.OutTempParam.queryParam.mainId = null;
+        this.$refs.EnterTempParam.loadInfo();
+        this.$refs.YureTempParam.loadInfo();
+        this.$refs.OutTempParam.loadInfo();
+        this.$refs.EnterTempParam.selectionRows = [];
+        this.$refs.YureTempParam.selectedRowKeys = [];
+        this.$refs.OutTempParam.selectionRows = [];
+        this.loadData();
+      }
+    }
+  }
+</script>
+<style scoped>
+  .ant-card-body .table-operator {
+    margin-bottom: 18px;
+  }
+
+  .ant-table-tbody .ant-table-row td {
+    padding-top: 15px;
+    padding-bottom: 15px;
+  }
+
+  .anty-row-operator button {
+    margin: 0 5px
+  }
+
+  .ant-btn-danger {
+    background-color: #ffffff
+  }
+
+  .ant-modal-cust-warp {
+    height: 100%
+  }
+
+  .ant-modal-cust-warp .ant-modal-body {
+    height: calc(100% - 110px) !important;
+    overflow-y: auto
+  }
+
+  .ant-modal-cust-warp .ant-modal-content {
+    height: 90% !important;
+    overflow-y: hidden
+  }
+</style>
\ No newline at end of file
diff --git a/ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterTempParamList.vue b/ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterTempParamList.vue
new file mode 100644
index 0000000..bdc1cc4
--- /dev/null
+++ b/ant-design-vue/src/views/ttwaterwaysystem/ttxhWaterTempParamList.vue
@@ -0,0 +1,100 @@
+<template>
+  <a-card :bordered="false">
+    <!-- table区域-begin -->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        @change="handleTableChange"
+      >
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <!-- <JeecgOrderTicket-modal ref="modalForm" @ok="modalFormOk"></JeecgOrderTicket-modal> -->
+  </a-card>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { getAction } from '@/api/manage'
+
+export default {
+  name: 'JeecgOrderTicketList',
+  mixins: [JeecgListMixin],
+  data() {
+    return {
+      description: '温度信息',
+      // 表头
+      columns: [
+        {
+          title: '温度1',
+          align: 'center',
+          dataIndex: 'ticketCode'
+        },
+        {
+          title: '温度2',
+          align: 'center',
+          dataIndex: 'tickectDate'
+        },
+        {
+          title: '温度3',
+          align: 'center',
+          dataIndex: 'orderId'
+        },
+        {
+          title: '温度4',
+          align: 'center',
+          dataIndex: 'createBy'
+        },
+        {
+          title: '温度5',
+          align: 'center',
+          dataIndex: 'createTime',
+          // sorter: true
+        }
+      ],
+      url: {
+        info: '/ttwaterwaycollect/ttWaterwayCollect/temoInfo',
+      }
+    }
+  },
+  methods: {
+    // 加载详情信息
+    loadInfo() {
+      var params = this.getQueryParams()
+      getAction(this.url.info, {
+        orderId: params.mainId,
+        // pageNo: this.ipagination.current,
+        // pageSize: this.ipagination.pageSize
+      }).then(res => {
+        console.log(res);
+        // if (res.success) {
+        //   this.dataSource = res.result.records
+        //   this.ipagination.total = res.result.total
+        // } else {
+        //   this.dataSource = null
+        // }
+      });
+    },
+    getTempInfo(mid) {
+      this.queryParam.mainId = mid;
+      this.loadInfo();
+    }
+  }
+}
+</script>
+<style scoped>
+.ant-card {
+  margin-left: -30px;
+  margin-right: -30px;
+}
+</style>