From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/pages/library/index/App.vue | 123 ++++++++++++++++++++++++++++++----------
1 files changed, 92 insertions(+), 31 deletions(-)
diff --git a/src/pages/library/index/App.vue b/src/pages/library/index/App.vue
index e57302c..e6a0954 100644
--- a/src/pages/library/index/App.vue
+++ b/src/pages/library/index/App.vue
@@ -5,18 +5,18 @@
<div class="resize-bar"></div>
<!-- <div class="resize-line"></div> -->
<div class="resize-save">
- <base-list
+ <baseList
ref="baseSync"
:title="`鍚屾搴揱"
type="sync"
:isSelected="isSelected"
@getList="getPersonList"
@changeShow="changeToAdd"
- ></base-list>
+ ></baseList>
</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,17 +28,20 @@
<car-list
ref="carList"
:baseObject="baseObject"
+ @changeShow="changeToAdd"
+ @onDelete="initBaseList"
+ :syncType="syncType"
v-show="showType == 'car'"
></car-list>
</div>
- <add-base
+ <addBase
ref="addBase"
:baseObject="baseForEdit"
:type="syncType"
- v-show="!showList"
+ v-if="!showList"
@refresh="findBaseSync"
@closeAdd="closeAdd"
- ></add-base>
+ ></addBase>
</div>
</div>
</div>
@@ -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,25 +97,28 @@
};
},
methods: {
- clearSelect1() {
- this.$refs.baseLocal.categoryIndex = -1;
- },
- clearSelect2() {
- this.$refs.baseSync.categoryIndex = -1;
- },
- getPersonList(item,type) {
- this.baseObject = item;
- this.baseForEdit = item;
- this.syncType = type
+ getPersonList(item, type) {
+ console.log(123);
+ console.log(item);
+ console.log(type);
+
+ if (item) {
+ this.baseObject = item;
+ this.baseForEdit = item;
+ this.syncType = type;
+ }
+
// 鐩存帴璋冪敤瀛愮粍浠跺埛鏂板垪琛ㄧ殑鏂规硶
// 鍒ゆ柇杩欐槸浜哄憳搴撹繕鏄溅杈嗗簱锛屽喅瀹歴howList鐨勫��
- if (item.tableType == "person") {
- this.showType = "person";
- this.$refs.personList.getPersonList();
- } else if (item.tableType == "car") {
- this.showType = "car";
- this.$refs.carList.getCarList();
- }
+ this.$nextTick(() => {
+ if (this.baseObject.tableType == "person") {
+ this.showType = "person";
+ this.$refs.personList.getPersonList();
+ } else if (this.baseObject.tableType == "car") {
+ this.showType = "car";
+ this.$refs.carList.getCarList();
+ }
+ });
this.breeadCrumb[1].name = "搴曞簱璇︽儏";
},
changeToAdd(item, type) {
@@ -106,16 +132,19 @@
this.syncType = type;
this.showList = false;
},
- initBaseList(){
- this.$refs.baseSync.init()
+ initBaseList() {
+ this.$refs.baseSync.init();
+ this.BaseManageData.queryTagList();
},
// 鏌ヨ鍚屾搴撳垪琛ㄦ暟鎹甛鏌ヨ鏈湴搴撳垪琛ㄦ暟鎹�
findBaseSync() {
this.BaseManageData.querySyncTables();
this.BaseManageData.queryLocalTables();
+ this.BaseManageData.queryTagList();
},
closeAdd() {
this.showList = true;
+ this.$refs.baseSync.init(this.syncType);
},
},
props: {
@@ -131,16 +160,49 @@
carList,
},
mounted() {
- //this.TreeDataPool.showTreeBox = false
+ window.addEventListener("message", (e) => {
+ if (e.data.msg === "changeColor") {
+ const res = colorRgb(e.data.color);
+ document.documentElement.style.setProperty(
+ "--colorCard",
+ `${e.data.color}`
+ );
+ }
+ });
+ },
+ created() {
+ 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}`);
+ }
},
};
</script>
-<style lang="scss" >
+<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;
}
@@ -165,7 +227,6 @@
position: relative;
background: #fff;
box-sizing: border-box;
- // border-right: 1px solid #e0e0e0;
}
.resize-save {
position: absolute;
@@ -177,7 +238,7 @@
overflow-x: hidden;
}
.resize-bar {
- width: 254px;
+ width: 244px;
height: inherit;
resize: horizontal;
cursor: ew-resize;
--
Gitblit v1.8.0