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/engineCheck/index.vue | 8 +-
jcdm-ui/src/views/main/kb/repairMark/index.vue | 47 ++++++++++++---
jcdm-ui/src/views/main/cfkb/Instructions/index.vue | 91 ++++++++++++++++++-----------
3 files changed, 97 insertions(+), 49 deletions(-)
diff --git a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
index 7c57df7..48a3e91 100644
--- a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
+++ b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
@@ -2,26 +2,29 @@
<div class="app-container">
<el-row :gutter="3">
<el-col :span="6">
- <el-card shadow="always">
- <img style="width: 200px;height: 50px; margin-left: 40px; margin-top: 0px" src="@/assets/logo/jcdm2.png" alt="dark">
- <span style="margin-left: 66px; font-weight: bold">{{currentTime}}</span>
+ <el-card shadow="always" class="boxSize">
+ <div class="centerImg">
+ <img style="width: 140px;height: 30px;" src="@/assets/logo/jcdm2.png" alt="dark">
+<!-- <span class="nextLine" style="font-weight: bold">{{currentTime}}</span>-->
+ </div>
+
</el-card>
</el-col>
<el-col :span="3">
- <el-card shadow="always">
- <span class="centerText" style="margin-top: 26px">{{locationCode}}</span>
+ <el-card shadow="always" class="boxSize">
+ <span class="centerText" style="height: 60px">{{locationCode}}</span>
</el-card>
</el-col>
<el-col :span="15">
- <el-card shadow="always">
- <span class="centerText">{{locationName}}</span>
+ <el-card shadow="always" class="boxSize">
+ <span class="centerText" >{{locationName}}</span>
</el-card>
</el-col>
</el-row>
<el-row :gutter="3" style="margin-top: 5px">
<el-col :span="6">
- <div style="height: 600px;overflow: auto;">
- <div class="container" style="height: 50px;background-color: #00afff;margin-bottom: 10px">
+ <div style="height: 550px;overflow: auto;">
+ <div class="container" style="height: 50px;background-color: #00afff;margin-bottom: 5px">
<span class="centered">浣滀笟娴佺▼</span>
</div>
<div v-for="(item,index) in tableData" :key="item.index" class="outerDiv" :id="'outerDiv'+index">
@@ -35,34 +38,40 @@
</div>
</el-col>
<el-col :span="18">
- <el-col :span="20">
- <el-card style="height: 600px" shadow="always">
- <el-row style="height: 100px">
- <span style="color: #31b431;font-size: 30px;font-weight: bold">{{address}}</span>
+ <el-col :span="18">
+ <el-card style="height: 550px" shadow="always">
+ <el-row style="height: 60px">
+ <span style="color: #31b431;font-size: 20px;font-weight: bold">{{address}}</span>
</el-row>
- <el-row style="height: 400px">
- <el-image style="height: 390px;width: 960px" :src="src"></el-image>
+ <el-row style="height: 420px">
+ <div class="centerImg">
+ <el-image style="height: 400px;width: 400px;" :src="src"></el-image>
+ </div>
+
<!-- {{src}}-->
</el-row>
- <el-row style="height: 100px">
- <el-button type="primary" @click="backClick()" style="height: 50px; width: 130px; font-size: 20px; float: left" icon="el-icon-d-arrow-left">涓婁竴姝�</el-button>
- <el-button type="primary" @click="nextStep()" style="height: 50px; width: 130px; font-size: 20px; float: right">涓嬩竴姝�<i class="el-icon-d-arrow-right"></i></el-button>
+ <el-row style="height: 100%;width: 100%">
+ <el-button type="primary" @click="backClick()" style="height: 50%; width: 20%; font-size: 20%; float: left" icon="el-icon-d-arrow-left">涓婁竴姝�</el-button>
+ <el-button type="primary" @click="nextStep()" style="height: 50%; width: 20%; font-size: 20%; float: right">涓嬩竴姝�<i class="el-icon-d-arrow-right"></i></el-button>
</el-row>
</el-card>
</el-col>
- <el-col :span="4">
- <el-card style="height: 600px" shadow="always">
- <el-row style="height: 100px;margin-top: 100px">
- <el-button type="primary" @click="processDocuments()" style="height: 50px; width: 130px; font-size: 20px; float: left" icon="el-icon-folder-opened">宸ヨ壓鏂囦欢</el-button>
+ <el-col :span="6">
+ <el-card style="height: 550px;width: 100%" shadow="always">
+ <el-row >
+ <div class="centerImg" style="height: 30%; margin-top: 60%">
+ <el-button type="primary" @click="processDocuments()" style="height: 40%; width: 90%; font-size: 70%; float: left" icon="el-icon-folder-opened">宸ヨ壓鏂囦欢</el-button>
+ </div>
+
</el-row>
- <el-row style="height: 80px;margin-top: 5px">
- <el-button type="info" @click="changeProducts('2V91')" :class="{ 'active': isClickd === '2V91' }" style="height: 50px; width: 130px; font-size: 20px; float: left" icon="el-icon-s-unfold">2V91</el-button>
+ <el-row style="height: 30%;margin-top: 40%" class="centerImg">
+ <el-button type="info" @click="changeProducts('2V91')" :class="{ 'active': isClickd === '2V91' }" style="height: 40%; width: 80%; font-size: 70%; float: left" icon="el-icon-s-unfold">2V91</el-button>
</el-row>
- <el-row style="height: 80px;">
- <el-button type="info" @click="changeProducts('191')" :class="{ 'active': isClickd === '191' }" style="height: 50px; width: 130px; font-size: 20px; float: left" icon="el-icon-s-unfold">191</el-button>
+ <el-row style="height: 30%;margin-top: 5%" class="centerImg">
+ <el-button type="info" @click="changeProducts('191')" :class="{ 'active': isClickd === '191' }" style="height: 40%; width: 80%; font-size: 70%; float: left" icon="el-icon-s-unfold">191</el-button>
</el-row>
- <el-row style="height: 80px;">
- <el-button type="info" @click="changeProducts('0JWF')" :class="{ 'active': isClickd === '0JWF' }" style="height: 50px; width: 130px; font-size: 20px; float: left" icon="el-icon-s-unfold">0JWF</el-button>
+ <el-row style="height: 30%;margin-top: 5%" class="centerImg">
+ <el-button type="info" @click="changeProducts('0JWF')" :class="{ 'active': isClickd === '0JWF' }" style="height: 40%; width: 80%; font-size: 70%; float: left" icon="el-icon-s-unfold">0JWF</el-button>
</el-row>
</el-card>
</el-col>
@@ -310,8 +319,8 @@
width: fit-content;
min-width: 102%;
/*width: 300px;*/
- height: 50px;
- margin-bottom: 10px;
+ height: 30px;
+ margin-bottom: 5px;
}
.innerDiv1 {
@@ -339,6 +348,7 @@
white-space: nowrap;
padding-left: 5px;
padding-right: 5px;
+ font-size: 20px;
}
.container {
display: flex;
@@ -356,13 +366,10 @@
.centerText{
color: black;
font-weight: bold;
- font-size: 40px;
+ font-size: 20px;
display: flex;
justify-content: center;
- margin-top: 20px
-}
-::v-deep .el-card__body{
- height: 100px;
+ margin-top: 5px
}
.active {
background-color: #31b431; /* 鐐瑰嚮鍚庣殑鑳屾櫙鑹� */
@@ -374,5 +381,19 @@
::v-deep .el-dialog__footer{
margin-top: 10px;
}
+::v-deep .el-card .is-always-shadow{
+ height: 60px;
+}
+.boxSize{
+ height: 60px;
+}
+.nextLine{
+ display: block;
+}
+.centerImg{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
</style>
diff --git a/jcdm-ui/src/views/main/kb/engineCheck/index.vue b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
index fbcb8b3..a3b2be1 100644
--- a/jcdm-ui/src/views/main/kb/engineCheck/index.vue
+++ b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
@@ -5,7 +5,7 @@
<div class="container" type="flex" justify="center" style="text-align:center">
<!-- <el-row type="flex" justify="center" style="text-align:center;height: 12px" >-->
<!-- <el-col type="flex" justify="center" :span="14" style="text-align:center">-->
- <span style="font-size:22px;color:black"><strong>鍙戝姩鏈烘暟鎹鏌�</strong></span>
+ <el-divider><span style="font-size:22px;color:black"><strong>鍙戝姩鏈烘暟鎹鏌�</strong></span></el-divider>
<!-- </el-col>-->
<!-- </el-row>-->
</div>
@@ -54,22 +54,20 @@
</el-col>
<el-col :span="10" inline style="margin-top: 5px">
- <el-tabs type="border-card" >
- <el-card class="custom-content" style="height: 242px;width:800px">
+ <el-card class="custom-content" style="height: 264px">
<el-col :span="14">
<span style="font-size:25px"><strong>璐ㄩ噺鐘舵��</strong></span>
<el-divider></el-divider>
{{this.form.engineCheckList}}
</el-col>
</el-card>
- <el-card class="custom-content" style="margin-top: 10px;height: 242px;width:800px" >
+ <el-card class="custom-content" style="height: 264px" >
<el-col :span="14"style=" ">
<span style="font-size:25px"><strong>鏈�缁堢粨鏋�</strong></span>
<el-divider></el-divider>
{{queryParams.productType}}
</el-col>
</el-card>
- </el-tabs>
</el-col>
</el-row>
</div>
diff --git a/jcdm-ui/src/views/main/kb/repairMark/index.vue b/jcdm-ui/src/views/main/kb/repairMark/index.vue
index 4a040c2..7659ad5 100644
--- a/jcdm-ui/src/views/main/kb/repairMark/index.vue
+++ b/jcdm-ui/src/views/main/kb/repairMark/index.vue
@@ -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" icon="el-icon-s-grid" @click="selectAll" style="margin-left: 10px; width: 100px;margin-top: 10px">閫夋嫨鎵�鏈�</el-button>
- <el-button type="success" icon="el-icon-close" @click="clearAll" style="width: 100px;margin-top: 10px">鍙栨秷閫夋嫨</el-button>
- <el-button type="success" icon="el-icon-document-remove" @click="selectUnqualified" style="width: 100px;margin-top: 10px">閫夋嫨涓嶅悎鏍�</el-button>
- <el-button type="success" icon="el-icon-s-flag" @click="markComplete" style="width: 100px;margin-top: 10px">鏍囪瀹屾垚</el-button>
- <el-button type="success" icon="el-icon-files" @click="repairRecord" style="width: 100px;margin-top: 10px">杩斾慨璁板綍</el-button>
- <el-button type="success" icon="el-icon-date" @click="operationLog" style="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