From 1e09a7a01a6c1888e1a2a832eb007fb8c2b653a0 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期三, 26 一月 2022 11:06:27 +0800
Subject: [PATCH] Merge branch 'bhomebus' of http://192.168.5.5:10010/r/web/vue-smart-ai into bhomebus
---
src/pages/library/index/App.vue | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/src/pages/library/index/App.vue b/src/pages/library/index/App.vue
index 1c21c31..2622da2 100644
--- a/src/pages/library/index/App.vue
+++ b/src/pages/library/index/App.vue
@@ -16,7 +16,7 @@
</div>
</div>
<div class="bg-white ml20 data-right-box">
- <div v-show="showList" style="height: 100%;">
+ <div v-show="showList" style="height: 100%">
<person-list
ref="personList"
:baseObject="baseObject"
@@ -28,6 +28,9 @@
<car-list
ref="carList"
:baseObject="baseObject"
+ @changeShow="changeToAdd"
+ @onDelete="initBaseList"
+ :syncType="syncType"
v-show="showType == 'car'"
></car-list>
</div>
@@ -35,7 +38,7 @@
ref="addBase"
:baseObject="baseForEdit"
:type="syncType"
- v-show="!showList"
+ v-if="!showList"
@refresh="findBaseSync"
@closeAdd="closeAdd"
></add-base>
@@ -48,6 +51,26 @@
import addBase from "../components/addBase";
import personList from "../components/personList";
import carList from "../components/carList";
+const colorRgb = function (s) {
+ var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
+ var color = s.toLowerCase();
+ if (reg.test(color)) {
+ if (color.length === 4) {
+ var colorNew = "#";
+ for (var i = 1; i < 4; i += 1) {
+ colorNew += color.slice(i, i + 1).concat(color.slice(i, i + 1));
+ }
+ color = colorNew;
+ }
+ var colorChange = [];
+ for (var i = 1; i < 7; i += 2) {
+ colorChange.push(parseInt("0x" + color.slice(i, i + 2)));
+ }
+ return "" + colorChange.join(",") + "";
+ } else {
+ return color;
+ }
+};
export default {
data() {
return {
@@ -74,16 +97,10 @@
};
},
methods: {
- clearSelect1() {
- this.$refs.baseLocal.categoryIndex = -1;
- },
- clearSelect2() {
- this.$refs.baseSync.categoryIndex = -1;
- },
- getPersonList(item,type) {
+ getPersonList(item, type) {
this.baseObject = item;
this.baseForEdit = item;
- this.syncType = type
+ this.syncType = type;
// 鐩存帴璋冪敤瀛愮粍浠跺埛鏂板垪琛ㄧ殑鏂规硶
// 鍒ゆ柇杩欐槸浜哄憳搴撹繕鏄溅杈嗗簱锛屽喅瀹歴howList鐨勫��
if (item.tableType == "person") {
@@ -106,8 +123,8 @@
this.syncType = type;
this.showList = false;
},
- initBaseList(){
- this.$refs.baseSync.init()
+ initBaseList() {
+ this.$refs.baseSync.init();
},
// 鏌ヨ鍚屾搴撳垪琛ㄦ暟鎹甛鏌ヨ鏈湴搴撳垪琛ㄦ暟鎹�
findBaseSync() {
@@ -133,6 +150,7 @@
mounted() {
window.addEventListener("message", (e) => {
if (e.data.msg === "changeColor") {
+ const res = colorRgb(e.data.color);
document.documentElement.style.setProperty(
"--colorCard",
`${e.data.color}`
@@ -141,9 +159,15 @@
});
},
created() {
- const color = localStorage.getItem("--colorCard");
+ let color = localStorage.getItem("--colorCard");
if (color) {
document.documentElement.style.setProperty("--colorCard", `${color}`);
+ } else {
+ color = getComputedStyle(document.documentElement).getPropertyValue(
+ "--colorCard"
+ );
+ const res = colorRgb(color);
+ document.documentElement.style.setProperty("--colorCard-rgb", `${res}`);
}
},
};
@@ -151,9 +175,22 @@
<style lang="scss" >
.s-base-manage {
box-sizing: border-box;
- background-color: #e9ebf2;
- // min-width: 1315px;
+ background-color: #eff1f5;
+ border-top: 1px solid #f1f3f6;
+
height: 100%;
+ .el-table {
+ .cell:empty::before {
+ content: "--";
+ color: #ccc;
+ }
+ .is-leaf {
+ .cell:empty::before {
+ content: "--";
+ color: #ccc;
+ }
+ }
+ }
.el-collapse {
border: none;
}
@@ -178,7 +215,6 @@
position: relative;
background: #fff;
box-sizing: border-box;
- // border-right: 1px solid #e0e0e0;
}
.resize-save {
position: absolute;
--
Gitblit v1.8.0