From 4e4e3042f9240816d49332f19ca85a68cb89c2e4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 19 七月 2024 09:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/contract/contract-result/index.vue | 2 +-
src/views/system/check/result/detail/detail.vue | 2 +-
src/layout/components/Navbar.vue | 6 +++---
src/views/screen/components/select-item/index.vue | 16 +++++++++++-----
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 1f814e8..c3202d4 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -39,13 +39,13 @@
</div>
<div class="button-container">
- <el-button type="primary" @click="toScreen">鍙鍖栧ぇ灞�</el-button>
+ <el-button type="primary" @click="toScreen" size="small">鍙鍖栧ぇ灞�</el-button>
</div>
<div class="button-container">
- <el-button type="primary" @click="toSystemB">璺宠浆B绯荤粺</el-button>
+ <el-button type="primary" @click="toSystemB" size="small">璺宠浆B绯荤粺</el-button>
</div>
<div class="button-container">
- <el-button type="primary" @click="toSystemA">璺宠浆A绯荤粺</el-button>
+ <el-button type="primary" @click="toSystemA" size="small">璺宠浆A绯荤粺</el-button>
</div>
</div>
</template>
diff --git a/src/views/screen/components/select-item/index.vue b/src/views/screen/components/select-item/index.vue
index 261d5f5..9a6d6bf 100644
--- a/src/views/screen/components/select-item/index.vue
+++ b/src/views/screen/components/select-item/index.vue
@@ -1,20 +1,20 @@
<template>
<div class="select-container">
<div class="tabs-box">
- <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-button v-for="item in testData1" class="transparent-button">{{ item.name }} </el-button>
+ <!-- <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane
v-for="item in testData1"
:label="item.name"
:name="item.value"
></el-tab-pane>
- </el-tabs>
+ </el-tabs> -->
<!-- <div>
<el-button>
</el-button>
</div> -->
</div>
-
<!-- <div class="type-select">
<div class="select-label">鏁版嵁婧�</div>
<el-select
@@ -127,7 +127,7 @@
<style lang="scss" scoped>
.select-container {
position: absolute;
- top: 0px;
+ top: 10px;
left: 20px;
display: flex;
align-items: center;
@@ -172,7 +172,7 @@
.el-tabs__item {
color: #ffffff !important;
}
- .is-active{
+ .is-active {
color: #4481dd !important;
}
}
@@ -189,4 +189,10 @@
::v-deep .date-select .el-date-editor .el-range-separator {
color: #4481dd !important;
}
+.transparent-button {
+ background-color: transparent;
+ border-color: #23f0ed;
+ color: #0d6adb; /* 杩欓噷璁剧疆鎸夐挳鏂囧瓧棰滆壊 */
+
+}
</style>
diff --git a/src/views/system/check/result/detail/detail.vue b/src/views/system/check/result/detail/detail.vue
index abc3a64..6e2108f 100644
--- a/src/views/system/check/result/detail/detail.vue
+++ b/src/views/system/check/result/detail/detail.vue
@@ -399,7 +399,7 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleRuleUpdate(row) {
this.reset("ruleForm");
- this.ruleForm = row;
+ this.ruleForm = JSON.parse(JSON.stringify(row));
this.ruleOpen = true;
this.title = "淇敼鑰冩牳瑙勫垯";
},
diff --git a/src/views/system/contract/contract-result/index.vue b/src/views/system/contract/contract-result/index.vue
index 20c0f51..1ca9384 100644
--- a/src/views/system/contract/contract-result/index.vue
+++ b/src/views/system/contract/contract-result/index.vue
@@ -221,7 +221,7 @@
width="180px"
>
</el-table-column>
- <el-table-column prop="num" label="鎸囨爣"> </el-table-column>
+ <el-table-column prop="num" label="閲忓��"> </el-table-column>
<el-table-column prop="score" label="鎵ｅ垎"> </el-table-column>
</el-table>
</el-dialog>
--
Gitblit v1.8.0