From ed7f09e0376d542bfddb05268f0081ba89a86868 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期三, 24 一月 2024 15:26:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/kb/repairMark/index.vue | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/repairMark/index.vue b/jcdm-ui/src/views/main/kb/repairMark/index.vue
index 5a836a5..7659ad5 100644
--- a/jcdm-ui/src/views/main/kb/repairMark/index.vue
+++ b/jcdm-ui/src/views/main/kb/repairMark/index.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<el-card class="box-card" >
<el-row>
- <el-divider style="margin-bottom: 10px"><span style="font-size: 40px">鍙戝姩鏈鸿繑淇爣璁扮郴缁�</span></el-divider>
+ <el-divider><span style="font-size: 30px">鍙戝姩鏈鸿繑淇爣璁扮郴缁�</span></el-divider>
</el-row>
<el-row style="margin-top: 10px">
<el-form :model="queryParams.sfcCode" ref="queryForm" :inline="true" label-width="68px" >
@@ -21,7 +21,7 @@
</el-form>
</el-row>
</el-card>
- <el-row :gutter="0">
+ <el-row>
<el-col :span="20">
<el-card style="margin-top: 10px; height: 490px;" class="box-card">
<el-table border ref="multipleTable" :data="passingStationCollectionList" @selection-change="handleSelectionChange">
@@ -38,12 +38,12 @@
</el-table-column>
<el-table-column label="鍏ョ珯鏃堕棿" align="center" prop="inboundTime" width="100">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.inboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="鍑虹珯鏃堕棿" align="center" prop="outboundTime" width="100">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.outboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="鏄惁鍚堟牸" align="center" prop="outRsSign">
@@ -52,7 +52,7 @@
</el-table-column>
<el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="鑺傛媿鏃堕棿" align="center" prop="beatTime">
@@ -61,14 +61,38 @@
</el-card>
</el-col>
<el-col :span="4">
- <el-card style="margin-top: 10px; min-height: 490px" class="box-card">
- <el-button type="success" @click="selectAll" style="margin-left: 50px;width: 100px;margin-top: 10px">閫夋嫨鎵�鏈�</el-button>
- <el-button type="success" @click="clearAll" style="margin-left: 50px; width: 100px;margin-top: 10px">鍙栨秷閫夋嫨</el-button>
- <el-button type="success" @click="selectUnqualified" style="margin-left: 50px; width: 100px;margin-top: 10px">閫夋嫨涓嶅悎鏍�</el-button>
- <el-button type="success" @click="markComplete" style="margin-left: 50px; width: 100px;margin-top: 10px">鏍囪瀹屾垚</el-button>
- <el-button type="success" @click="repairRecord" style="margin-left: 50px; width: 100px;margin-top: 10px">杩斾慨璁板綍</el-button>
- <el-button type="success" @click="operationLog" style="margin-left: 50px; width: 100px;margin-top: 10px">鎿嶄綔鏃ュ織</el-button>
+ <el-card style="margin-top: 10px; min-height: 490px">
+ <el-row class="centered-row">
+ <el-button type="success" icon="el-icon-s-grid" @click="selectAll" >閫夋嫨鎵�鏈�</el-button>
+ </el-row>
+ <el-row class="centered-row">
+ <el-button type="success" icon="el-icon-close" @click="clearAll">鍙栨秷閫夋嫨</el-button>
+
+ </el-row>
+ <el-row class="centered-row">
+ <el-button type="success" icon="el-icon-document-remove" @click="selectUnqualified">閫夋嫨涓嶅悎鏍�</el-button>
+
+ </el-row>
+ <el-row class="centered-row">
+ <el-button type="success" icon="el-icon-s-flag" @click="markComplete">鏍囪瀹屾垚</el-button>
+
+ </el-row> <el-row class="centered-row">
+ <el-button type="success" icon="el-icon-files" @click="repairRecord">杩斾慨璁板綍</el-button>
+
+ </el-row>
+ <el-row class="centered-row">
+ <el-button type="success" icon="el-icon-date" @click="operationLog" >鎿嶄綔鏃ュ織</el-button>
+
+ </el-row>
+
+
+
+<!-- <el-button type="success" icon="el-icon-close" @click="clearAll">鍙栨秷閫夋嫨</el-button>-->
+<!-- <el-button type="success" icon="el-icon-document-remove" @click="selectUnqualified">閫夋嫨涓嶅悎鏍�</el-button>-->
+<!-- <el-button type="success" icon="el-icon-s-flag" @click="markComplete">鏍囪瀹屾垚</el-button>-->
+<!-- <el-button type="success" icon="el-icon-files" @click="repairRecord">杩斾慨璁板綍</el-button>-->
+<!-- <el-button type="success" icon="el-icon-date" @click="operationLog" >鎿嶄綔鏃ュ織</el-button>-->
</el-card>
</el-col>
</el-row>
@@ -203,7 +227,12 @@
::v-deep .el-form-item__label{
font-size: large;
}
-::v-deep .el-card__body{
- padding: 15px 20px 0px 20px;
+.el-icon-close {
+ margin-left: 20px;
+}
+.centered-row {
+ margin-top: 10px;
+ display: flex;
+ justify-content: center;
}
</style>
--
Gitblit v1.9.3