From b623db3030713d83dac4d90c4f71f4312bd7f9ce Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期一, 29 一月 2024 14:07:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/da/tileMatchRules/index.vue | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
index c7e7eb5..e748cbf 100644
--- a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
+++ b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
@@ -96,38 +96,27 @@
<el-table border v-loading="loading" :data="tileMatchRulesList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="涓婚敭id" align="center" prop="id" />-->
- <el-table-column label="浜у搧绯诲垪" align="center" prop="productSeries">
-
+ <el-table-column label="浜у搧绯诲垪" align="center" prop="productSeries" width="90">
</el-table-column>
- <el-table-column label="鎵爜瀵硅薄1" align="center" prop="scanObject1" width="100">
-
+ <el-table-column label="鎵爜瀵硅薄1" align="center" prop="scanObject1" width="90">
</el-table-column>
- <el-table-column label="鎵爜瀵硅薄2" align="center" prop="scanObject2" width="100">
-
+ <el-table-column label="鎵爜瀵硅薄2" align="center" prop="scanObject2" width="90">
</el-table-column>
<el-table-column label="杞村悕绉�" align="center" prop="axisName">
-
</el-table-column>
<el-table-column label="棰堝悕绉�" align="center" prop="neckName">
-
</el-table-column>
<el-table-column label="鐡﹀悕绉�" align="center" prop="tileName">
-
</el-table-column>
- <el-table-column label="杞村弬鏁颁綅缃�" align="center" prop="axisParameterNoPosition" width="100">
-
+ <el-table-column label="杞村弬鏁颁綅缃�" align="center" prop="axisParameterNoPosition" width="90">
</el-table-column>
- <el-table-column label="棰堝弬鏁颁綅缃�" align="center" prop="neckParameterPosition" width="100">
-
+ <el-table-column label="棰堝弬鏁颁綅缃�" align="center" prop="neckParameterPosition" width="90">
</el-table-column>
<el-table-column label="杞村��" align="center" prop="axisValue">
-
</el-table-column>
<el-table-column label="棰堝��" align="center" prop="neckValue">
-
</el-table-column>
<el-table-column label="鐡﹂鑹�" align="center" prop="tileColor">
-
</el-table-column>
<!-- <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">-->
@@ -174,7 +163,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀归厤鐡﹁鍒欏璇濇 -->
- <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="650px" append-to-body>
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="700px" append-to-body>
<span slot="title">
<i class="el-icon-s-order"></i>
{{titleName}}
--
Gitblit v1.9.3