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 | 125 +++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 56 deletions(-)
diff --git a/src/pages/library/index/App.vue b/src/pages/library/index/App.vue
index a56c999..e6a0954 100644
--- a/src/pages/library/index/App.vue
+++ b/src/pages/library/index/App.vue
@@ -47,30 +47,30 @@
</div>
</template>
<script>
-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()
+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 = "#"
+ var colorNew = "#";
for (var i = 1; i < 4; i += 1) {
- colorNew += color.slice(i, i + 1).concat(color.slice(i, i + 1))
+ colorNew += color.slice(i, i + 1).concat(color.slice(i, i + 1));
}
- color = colorNew
+ color = colorNew;
}
- var colorChange = []
+ var colorChange = [];
for (var i = 1; i < 7; i += 2) {
- colorChange.push(parseInt("0x" + color.slice(i, i + 2)))
+ colorChange.push(parseInt("0x" + color.slice(i, i + 2)));
}
- return "" + colorChange.join(",") + ""
+ return "" + colorChange.join(",") + "";
} else {
- return color
+ return color;
}
-}
+};
export default {
data() {
return {
@@ -86,90 +86,103 @@
{
name: "搴曞簱绠＄悊",
path: "/baseManage",
- params: {}
+ params: {},
},
{
name: "搴曞簱璇︽儏",
path: "/baseManage",
- params: {}
- }
- ]
- }
+ params: {},
+ },
+ ],
+ };
},
methods: {
getPersonList(item, type) {
- this.baseObject = item
- this.baseForEdit = item
- this.syncType = type
+ console.log(123);
+ console.log(item);
+ console.log(type);
+
+ if (item) {
+ this.baseObject = item;
+ this.baseForEdit = item;
+ this.syncType = type;
+ }
// 鐩存帴璋冪敤瀛愮粍浠跺埛鏂板垪琛ㄧ殑鏂规硶
// 鍒ゆ柇杩欐槸浜哄憳搴撹繕鏄溅杈嗗簱锛屽喅瀹歴howList鐨勫��
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()
+ 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 = "搴曞簱璇︽儏"
+ });
+ 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() {
- this.$refs.baseSync.init()
+ this.$refs.baseSync.init();
+ this.BaseManageData.queryTagList();
},
// 鏌ヨ鍚屾搴撳垪琛ㄦ暟鎹甛鏌ヨ鏈湴搴撳垪琛ㄦ暟鎹�
findBaseSync() {
- this.BaseManageData.querySyncTables()
- this.BaseManageData.queryLocalTables()
+ this.BaseManageData.querySyncTables();
+ this.BaseManageData.queryLocalTables();
+ this.BaseManageData.queryTagList();
},
closeAdd() {
- this.showList = true
- this.$refs.baseSync.init(this.syncType)
- }
+ 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") {
- const res = colorRgb(e.data.color)
- document.documentElement.style.setProperty("--colorCard", `${e.data.color}`)
+ const res = colorRgb(e.data.color);
+ document.documentElement.style.setProperty(
+ "--colorCard",
+ `${e.data.color}`
+ );
}
- })
+ });
},
created() {
- let 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}`)
+ color = getComputedStyle(document.documentElement).getPropertyValue(
+ "--colorCard"
+ );
+ const res = colorRgb(color);
+ document.documentElement.style.setProperty("--colorCard-rgb", `${res}`);
}
- }
-}
+ },
+};
</script>
<style lang="scss">
.s-base-manage {
--
Gitblit v1.8.0