From 04b8eff075a04db23e6f908855699b4d2954588c Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期四, 23 五月 2024 18:47:01 +0800
Subject: [PATCH] 380新产品,优化
---
jcdm-ui/src/views/main/da/tileMatchRules/index.vue | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
index e748cbf..104eb91 100644
--- a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
+++ b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue
@@ -116,7 +116,10 @@
</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 label="鐡﹂鑹�" align="center" prop="tileColor" >
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.colour_hex" :value="scope.row.tileColor" style="color: #FFFFFF;" :style="{ backgroundColor: scope.row.tileColor }"/>
+ </template>
</el-table-column>
<!-- <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">-->
@@ -199,8 +202,21 @@
<el-form-item label="棰堝��" prop="neckValue">
<el-input v-model="form.neckValue" placeholder="璇疯緭鍏ラ鍊�" />
</el-form-item>
- <el-form-item label="鐡﹂鑹�" prop="tileColor">
+<!-- <el-form-item label="鐡﹂鑹�" prop="tileColor">
<el-input v-model="form.tileColor" placeholder="璇疯緭鍏ョ摝棰滆壊" />
+ </el-form-item>-->
+<!-- <el-form-item label="鐡﹂鑹�" prop="tileColor" required>
+ <el-color-picker v-model="form.tileColor" size="medium"></el-color-picker>
+ </el-form-item>-->
+ <el-form-item label="鐡﹂鑹�" prop="tileColor">
+ <el-select v-model="form.tileColor" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option
+ v-for="dict in dict.type.colour_hex"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<!-- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">-->
<!-- <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />-->
@@ -232,7 +248,7 @@
export default {
name: "TileMatchRules",
- dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable'],
+ dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable','colour_hex'],
data() {
return {
advancedShowSearch: false,
--
Gitblit v1.9.3