From c7a5e18fa52ef6faf053e584a4ae9bb5bc55943b Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期一, 22 一月 2024 08:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/kb/engineCheck/index.vue | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/engineCheck/index.vue b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
index 4346a16..65d5a51 100644
--- a/jcdm-ui/src/views/main/kb/engineCheck/index.vue
+++ b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
@@ -12,7 +12,7 @@
</template>
</el-card>
<el-row :gutter="5" style="margin-top: 10px">
- <el-col :span="10" >
+ <el-col :span="10" style=" height:600px;width:800px" >
<el-card class="bottom-card">
<el-descriptions :column="1" >
<el-descriptions-item>
@@ -62,7 +62,7 @@
</el-card>
</el-col>
- <el-col :span="14" inline style="height:600px;width:850px ">
+ <el-col :span="14" inline style="height:600px;width:600px ">
<el-tabs type="border-card" >
<el-card>
<el-col :span="14"style="height: 270px;width:800px ">
@@ -163,8 +163,18 @@
else{
this.reset();
this.buttondisabled = true
- this.$modal.msgError('杈撳叆鐨勫彂鍔ㄦ満鍙锋湁璇�');
- }
+ // this.$modal.msgError('杈撳叆鐨勫彂鍔ㄦ満鍙锋湁璇�');
+ const h = this.$createElement;
+ this.$message({
+ message: h('p',null, [
+ h('span', null, '璀﹀憡 '),
+ h('i', { style: 'color: black' }, '杈撳叆鐨勫彂鍔ㄦ満鍙锋湁璇�'),
+ h()]),
+ type: 'error',
+ center: true,
+ offset:300
+ });
+ }
});
let PassingStationCollectionParam = {sfcCode: null}
PassingStationCollectionParam.sfcCode = this.form.engineNo;
@@ -192,9 +202,16 @@
<style scoped>
::v-deep .el-input__inner{
height: 50px;
+ width: 450px;
}
::v-deep .el-form-item__label {
line-height: 50px;
}
+/*.my-custom-modal .el-dialog__wrapper {*/
+/* width: 400px; !* 璁剧疆瀹藉害 *!*/
+/* height: 200px; !* 璁剧疆楂樺害 *!*/
+/* top: 50px; !* 璁剧疆璺濈椤甸潰椤堕儴鐨勪綅缃� *!*/
+/* left: 50px; !* 璁剧疆璺濈椤甸潰宸︿晶鐨勪綅缃� *!*/
+/*}*/
</style>
--
Gitblit v1.9.3