From 81c9b1f75b80fade52653243b914ccb2677b4a8f Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 22 三月 2022 18:34:17 +0800
Subject: [PATCH] 禅道bug修复
---
src/pages/library/index/App.vue | 144 ++++++++++++++++++++++++++++++-----------------
1 files changed, 92 insertions(+), 52 deletions(-)
diff --git a/src/pages/library/index/App.vue b/src/pages/library/index/App.vue
index 9d294ea..a56c999 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"
@@ -34,23 +34,43 @@
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>
</template>
<script>
-import baseList from "../components/baseList";
-import addBase from "../components/addBase";
-import personList from "../components/personList";
-import carList from "../components/carList";
+import baseList from "../components/baseList"
+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 {
@@ -66,90 +86,110 @@
{
name: "搴曞簱绠＄悊",
path: "/baseManage",
- params: {},
+ params: {}
},
{
name: "搴曞簱璇︽儏",
path: "/baseManage",
- params: {},
- },
- ],
- };
+ params: {}
+ }
+ ]
+ }
},
methods: {
- getPersonList(item,type) {
- this.baseObject = item;
- this.baseForEdit = item;
- this.syncType = type
+ getPersonList(item, type) {
+ 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.breeadCrumb[1].name = "搴曞簱璇︽儏";
+ this.$nextTick(() => {
+ if (item.tableType == "person") {
+ this.showType = "person"
+ this.$refs.personList.getPersonList()
+ } else if (item.tableType == "car") {
+ this.showType = "car"
+ this.$refs.carList.getCarList()
+ }
+ })
+ this.breeadCrumb[1].name = "搴曞簱璇︽儏"
},
changeToAdd(item, type) {
if (item !== null) {
- this.baseForEdit = item;
- this.breeadCrumb[1].name = "搴曞簱淇℃伅";
+ this.baseForEdit = item
+ this.breeadCrumb[1].name = "搴曞簱淇℃伅"
} else {
- this.baseForEdit = {};
- this.breeadCrumb[1].name = "娣诲姞搴曞簱";
+ this.baseForEdit = {}
+ this.breeadCrumb[1].name = "娣诲姞搴曞簱"
}
- this.syncType = type;
- this.showList = false;
+ this.syncType = type
+ this.showList = false
},
- initBaseList(){
+ initBaseList() {
this.$refs.baseSync.init()
},
// 鏌ヨ鍚屾搴撳垪琛ㄦ暟鎹甛鏌ヨ鏈湴搴撳垪琛ㄦ暟鎹�
findBaseSync() {
- this.BaseManageData.querySyncTables();
- this.BaseManageData.queryLocalTables();
+ this.BaseManageData.querySyncTables()
+ this.BaseManageData.queryLocalTables()
},
closeAdd() {
- this.showList = true;
- },
+ this.showList = true
+ this.$refs.baseSync.init(this.syncType)
+ }
},
props: {
cameraId: {
default: "",
- type: String,
- },
+ type: String
+ }
},
components: {
baseList,
addBase,
personList,
- carList,
+ carList
},
mounted() {
window.addEventListener("message", (e) => {
if (e.data.msg === "changeColor") {
- document.documentElement.style.setProperty(
- "--colorCard",
- `${e.data.color}`
- );
+ const res = colorRgb(e.data.color)
+ document.documentElement.style.setProperty("--colorCard", `${e.data.color}`)
}
- });
+ })
},
created() {
- const color = localStorage.getItem("--colorCard");
+ let color = localStorage.getItem("--colorCard")
if (color) {
- document.documentElement.style.setProperty("--colorCard", `${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;
+ 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;
}
--
Gitblit v1.8.0