From a089cbebaebcf7a49a08035aee56ca7a807ca241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Tue, 5 Nov 2024 15:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BF=9D/=E6=90=9C=E7=B4=A2=E4=B8=AD?=
=?UTF-8?q?=E5=BF=83=E5=8A=A0=E5=8F=82=E4=BF=9D/=E6=A3=AE=E8=8C=82?=
=?UTF-8?q?=E6=A5=BC=E5=B1=82=E5=8A=A0=E6=98=AF=E5=90=A6=E5=8F=AF=E6=9F=A5?=
=?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +
src/assets/styles/isTable.scss | 2 +-
src/components/DictTag/index.vue | 59 ++++++++++++-------
src/components/NavigationBar/logCentre.vue | 13 ++--
src/components/NavigationBar/peopleCentre.vue | 32 ++++++++--
.../NavigationBar/recycleCentre.vue | 13 ++--
src/components/NavigationBar/userModel.vue | 6 +-
.../NavigationBar/warningCentre.vue | 13 ++--
src/main.js | 2 +
src/utils/myFuntion.js | 17 ++++++
src/views/components/xiaoqu/bottomList.vue | 36 ++++++++---
.../components/xiaoqu/bottomListHeader.vue | 6 +-
src/views/components/xiaoqu/house.vue | 58 +++++++++++++++---
.../components/xiaoqu/map/buildjson/8_5.json | 28 ---------
.../xiaoqu/map/buildjson/buildjson.js | 1 +
src/views/components/xiaoqu/map/smBuild.vue | 12 +++-
.../xiaoqu/rightData/realTimeList.vue | 4 --
vue.config.js | 7 +++
18 files changed, 206 insertions(+), 105 deletions(-)
diff --git a/.env.development b/.env.development
index 3c6a2d5..c76ff68 100644
--- a/.env.development
+++ b/.env.development
@@ -8,6 +8,8 @@ ENV = 'development'
VUE_APP_BASE_API_HTML = "http://122.193.93.182:19002"
VUE_APP_BASE_API = 'http://122.193.93.182:19002'
+VUE_APP_BASE_API_SB = '/outApiData'
+
# 测试/开发环境
# VUE_APP_BASE_API_HTML = "http://192.168.0.120:19002"
# VUE_APP_BASE_API = "http://192.168.0.120:19002"
diff --git a/src/assets/styles/isTable.scss b/src/assets/styles/isTable.scss
index 3337040..618651a 100644
--- a/src/assets/styles/isTable.scss
+++ b/src/assets/styles/isTable.scss
@@ -35,7 +35,7 @@
.option-list {
position: relative;
- top: 2px;
+ top: 1px;
left: 0;
display: flex;
align-items: center;
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index 6b5b230..5f62198 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -3,11 +3,14 @@
{{ item.label + ' ' }}{{ item.label + " " }}
- {{ item.label + ' ' }}
+ {{ item.label + " " }}
@@ -43,43 +46,55 @@ export default {
},
separator: {
type: String,
- default: ","
- }
+ default: ",",
+ },
},
data() {
return {
unmatchArray: [], // 记录未匹配的项
- }
+ };
},
computed: {
values() {
- if (this.value === null || typeof this.value === 'undefined' || this.value === '') return []
- return Array.isArray(this.value) ? this.value.map(item => '' + item) : String(this.value).split(this.separator)
+ if (
+ this.value === null ||
+ typeof this.value === "undefined" ||
+ this.value === ""
+ )
+ return [];
+ return Array.isArray(this.value)
+ ? this.value.map((item) => "" + item)
+ : String(this.value).split(this.separator);
},
unmatch() {
- this.unmatchArray = []
+ this.unmatchArray = [];
// 没有value不显示
- if (this.value === null || typeof this.value === 'undefined' || this.value === '' || this.options.length === 0) return false
+ if (
+ this.value === null ||
+ typeof this.value === "undefined" ||
+ this.value === "" ||
+ this.options.length === 0
+ )
+ return false;
// 传入值为数组
- let unmatch = false // 添加一个标志来判断是否有未匹配项
- this.values.forEach(item => {
- if (!this.options.some(v => v.value === item)) {
- this.unmatchArray.push(item)
- unmatch = true // 如果有未匹配项,将标志设置为true
+ let unmatch = false; // 添加一个标志来判断是否有未匹配项
+ this.values.forEach((item) => {
+ if (!this.options.some((v) => v.value === item)) {
+ this.unmatchArray.push(item);
+ unmatch = true; // 如果有未匹配项,将标志设置为true
}
- })
- return unmatch // 返回标志的值
+ });
+ return unmatch; // 返回标志的值
},
-
},
filters: {
handleArray(array) {
- if (array.length === 0) return '';
+ if (array.length === 0) return "";
return array.reduce((pre, cur) => {
- return pre + ' ' + cur;
- })
+ return pre + " " + cur;
+ });
},
- }
+ },
};