From 6e796f084d9ad46d278c25003c0f30832f05f905 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 13 Dec 2023 17:34:36 +0800
Subject: [PATCH] 标签样式修改
---
src/config/website.js | 1 +
vue.config.js | 4 +++-
src/views/userHouse/houseHoldList.vue | 35 +++++++++++++++++++++++++----------
3 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/config/website.js b/src/config/website.js
index ecfbfb2..a146ab9 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -48,6 +48,7 @@
ssoUrl: 'http://localhost:8100/oauth/authorize?client_id=saber&response_type=code&redirect_uri=',
// 单点登录回调地址(Saber服务的地址)
redirectUri: 'http://localhost:1888',
+ // redirectUri:'http://192.168.0.102:9528',
// minio 基础路径
minioUrl: 'https://srgdjczzxtpt.com:2080/gminio/jczz/'
}
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index f18e46d..e9fd58c 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -52,8 +52,7 @@
</span>
</el-dialog>
- <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center>
-
+ <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center width="600px">
<div id="" v-for="(item1,index1) in labelData">
<el-row>
<el-col :span="24">
@@ -63,22 +62,21 @@
</el-col>
</el-row>
<div id="" class="grid-container2" v-if="item1.children">
- <div id="" v-for="(item2,index2) in item1.children ">
- <div id="" @click="changLabel(item2)">
+
+ <div class="grid-item" v-for="(item2,index2) in item1.children " @click="changLabel(item2)">
{{item2.name}}
</div>
- </div>
</div>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="roleBox = false">取 消</el-button>
+ <el-button @click="labelFlag = false">取 消</el-button>
<el-button type="primary" @click="submitRole">确 定</el-button>
</span>
</el-dialog>
- <el-dialog title="编辑标签" append-to-body :visible.sync="editLabelFlge" width="655px">
+ <el-dialog :title="'编辑标签' + currentLabel.name" append-to-body :visible.sync="editLabelFlge" width="655px">
<avue-form :option="labelOption" v-model="excelForm">
<template slot="excelTemplate">
@@ -297,7 +295,8 @@
span: 24,
}
]
- }
+ },
+ currentLabel:""
};
},
watch: {},
@@ -317,6 +316,7 @@
changLabel(item) {
this.editLabelFlge = true
+ this.currentLabel = item;
},
manageLabel() {
this.labelFlag = true
@@ -485,9 +485,24 @@
}
.grid-container2 {
- display: grid;
+ /* display: grid;
grid-template-columns: auto auto auto auto;
- grid-gap: 10px;
+ grid-gap: 10px; */
+ display: flex;
+ flex-wrap: wrap;
+ padding-bottom:20px;
+ }
+ .grid-item{
+ padding:8px 14px;
+ border:1px solid #dcdfe6;
+ margin-right:10px;
+ margin-bottom:10px;
+ border-radius: 20px;
+ }
+ .grid-item:hover{
+ background-color: #e8f4ff;
+ color:#017BFC;
+ cursor: pointer;
}
.el-scrollbar {
diff --git a/vue.config.js b/vue.config.js
index b3c86c4..33c79c1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,9 +26,11 @@
proxy: {
'/api': {
//本地服务接口地址
- target: 'http://localhost:9528',
+ // target: 'http://localhost:9528',
+ target: 'http://192.168.0.102:9528',
//远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.cn/api',
+ changeOrigin: true,
ws: true,
pathRewrite: {
'^/api': '/'
--
Gitblit v1.9.3