From bae61829b323cd391e277ad6c054770f4b7a3f8a Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期三, 26 六月 2024 19:45:22 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/components/matching/matching.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/components/matching/matching.vue b/src/components/matching/matching.vue
index a1f76a1..bcc4cc4 100644
--- a/src/components/matching/matching.vue
+++ b/src/components/matching/matching.vue
@@ -15,7 +15,7 @@
:key="index"
ref="left"
@mousedown="(e) => touchstart(e, item, index)"
- :style="{ backgroundColor: primaryColor }"
+ :style="{ backgroundColor: primaryColor,border:'1px solid' + bordercolor }"
v-html="item.label.txt"
></div>
</div>
@@ -25,7 +25,7 @@
v-for="(item, index) in rightArr"
:key="index"
ref="right"
- :style="{ backgroundColor: primaryColor }"
+ :style="{ backgroundColor: primaryColor,border:'1px solid' + bordercolor }"
v-html="item.label.txt"
></div>
</div>
@@ -46,11 +46,11 @@
<!-- 鎸夐挳 -->
<div class="btn-bottom">
<el-button @click="submitData">鎻愪氦</el-button>
- <el-button @click="saveData" :style="{ borderColor: primaryColor }"
+ <el-button @click="saveData" :style="{ borderColor: bordercolor }"
>淇濆瓨</el-button
>
<el-button @click="redo">閲嶅仛</el-button>
- <el-button @click="handleAnswer" :style="{ borderColor: primaryColor }"
+ <el-button @click="handleAnswer" :style="{ borderColor: bordercolor }"
>鏌ョ湅绛旀</el-button
>
</div>
@@ -112,8 +112,12 @@
},
primaryColor: {
type: String,
- default: "#0bab87",
+ default: "#fff",
},
+ bordercolor:{
+ type:String,
+ default:'#f49a4c'
+ }
},
watch: {
rawData: {
--
Gitblit v1.9.1