From 0e0944361a66439f7be48567c2fe6c482dd37a5c Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期一, 01 二月 2021 13:57:26 +0800
Subject: [PATCH] 朔黄转储设备相关页面更新
---
src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue | 157 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 141 insertions(+), 16 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue b/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue
index 9dbc0bc..cc0bccd 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/transferMemo.vue
@@ -3,55 +3,177 @@
<div class="filter-bar flex-box">
<div>
<label>鎿嶄綔鏃堕棿:</label>
- <div></div>
+ <el-date-picker
+ v-model="searchTime"
+ type="datetimerange"
+ size="small"
+ :picker-options="pickerOptions"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ align="right"
+ ></el-date-picker>
</div>
<div>
<label>鎿嶄綔浜�:</label>
<div>
- <el-input v-model="operator" size="small"></el-input>
+ <el-input v-model="Operator" size="small"></el-input>
</div>
</div>
<div>
<label>杞偍鐘舵��:</label>
<div>
- <el-select v-model="transferStatus" size="small">
+ <el-select v-model="Status" size="small">
+ <el-option value="" label="鍏ㄩ儴"></el-option>
<el-option
v-for="item in allTransferStatus"
:key="item.id"
- :value="item.id"
+ :value="item.name"
:label="item.name"
></el-option>
</el-select>
</div>
</div>
<div class="btns">
- <el-button type="primary" size="small">鏌ヨ</el-button>
+ <el-button type="primary" size="small" @click="renderTable">鏌ヨ</el-button>
+ <el-button type="primary" size="small" @click="resetFilter">閲嶇疆</el-button>
</div>
</div>
<div class="table-area">
<el-table :data="tableData" fit>
- <el-table-column prop="time" label="鎿嶄綔鏃堕棿"></el-table-column>
- <el-table-column prop="operator" label="鎿嶄綔浜�"></el-table-column>
- <el-table-column prop="tranferDevice" label="杞偍璁惧鍚嶇О"></el-table-column>
- <el-table-column prop="pos" label="鍗℃Ы浣嶇疆"></el-table-column>
- <el-table-column prop="transferStatus" label="杞偍鐘舵��"></el-table-column>
- <el-table-column prop="pic" label="鐜板満鍥剧墖"></el-table-column>
- <el-table-column prop="content" label="杞偍鍐呭"></el-table-column>
+ <el-table-column prop="OperaterDate" label="鎿嶄綔鏃堕棿"></el-table-column>
+ <el-table-column prop="Operator" label="鎿嶄綔浜�"></el-table-column>
+ <el-table-column prop="tranferDevice" label="杞偍璁惧鍚嶇О">
+ <template slot-scope="scope">
+ <div>
+ 璁惧{{scope.$index}}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="SlotID" label="鍗℃Ы浣嶇疆">
+ <template slot-scope="scope">
+ <div>
+ 鎻掓Ы{{scope.row.SlotID}}
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="Status" label="杞偍鐘舵��"></el-table-column>
+ <el-table-column prop="Cover" label="鐜板満鍥剧墖"></el-table-column>
+ <el-table-column prop="Content" label="杞偍鍐呭"></el-table-column>
</el-table>
- <el-pagination background layout="prev, pager, next" :total="tableDataTotal"></el-pagination>
+ <el-pagination
+ class="pagination-under-table"
+ @size-change="handleTableSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page.sync="PageIndex"
+ :page-size="PageSize"
+ :page-sizes="pageSizes"
+ layout="total,sizes, prev, pager, next"
+ :total="tableTotal"
+ ></el-pagination>
</div>
</div>
</template>
<script>
+import { getTransferStatusList,getTransferRecord } from "@/api/shuohuang"
export default {
data () {
return {
- transferStatus: '',
- operator: '',
+ pickerOptions: {
+ shortcuts: [{
+ text: '浠婂ぉ',
+ onClick (picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setHours(0, 0, 0);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '鏄ㄥぉ',
+ onClick (picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24);
+ start.setHours(0, 0, 0);
+ end.setTime(end.getTime() - 3600 * 1000 * 24);
+ end.setHours(23, 59, 59);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '杩戜笁澶�',
+ onClick (picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '杩戜竴鍛�',
+ onClick (picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ //start.setHours(0,0,0);
+ picker.$emit('pick', [start, end]);
+ }
+ }]
+ },
+ Status: '',
+ Operator: '',
allTransferStatus: [],
tableData: [],
- tableDataTotal: 5
+ tableTotal: 0,
+ PageIndex: 1,
+ pageSizes: [8, 15, 20],
+ PageSize: 8,
+ searchTime: [this.$moment(new Date().getTime() - 3600 * 1000 * 24 * 5).format("YYYY-MM-DD HH:mm:ss"), this.$moment(new Date()).format("YYYY-MM-DD HH:mm:ss")],
+ }
+ },
+ mounted () {
+ this.renderTable();
+ this.renderTransferStatusList();
+ },
+ methods: {
+ handleCurrentChange(){
+ this.renderTable();
+ },
+ resetFilter(){
+ this.searchTime = [];
+ this.Operator = '';
+ this.Status = '';
+ this.renderTable();
+ },
+ handleTableSizeChange (size) {
+ this.tablePageSize = size;
+ this.renderTable();
+ },
+ renderTransferStatusList(){
+ let _this = this;
+ getTransferStatusList().then(res=>{
+ _this.allTransferStatus = res.data.map((item,index)=>{
+ return {
+ id: 'sta'+index,
+ name: item
+ }
+ });
+ })
+ },
+ renderTable () {
+ let _this = this;
+ let params = {
+ Operator: this.Operator,
+ Status: this.Status,
+ PageIndex: this.PageIndex,
+ PageSize: this.PageSize,
+ StartDate: this.searchTime ? this.searchTime[0]:'',
+ EndDate: this.searchTime ? this.searchTime[1]:'',
+ };
+
+ getTransferRecord(params).then(res=>{
+ _this.tableData = res.data;
+ _this.tableTotal = res.total;
+ })
}
}
}
@@ -81,5 +203,8 @@
cursor: pointer;
}
}
+ .pagination-under-table{
+ margin-top: 20px;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0