diff --git a/src/components/FecrLine.vue b/src/components/FecrLine.vue
index 7e7254b..508e4e8 100644
--- a/src/components/FecrLine.vue
+++ b/src/components/FecrLine.vue
@@ -15,10 +15,8 @@ export default {
return {};
},
mounted() {
- if (this.data) {
- this.$nextTick(() => {
+ if (Object.keys(this.data).length!==0) {
this.initLine();
- });
}
},
methods: {
diff --git a/src/view/home/FecrAside.vue b/src/view/home/FecrAside.vue
index 6c7d5c6..2d0528a 100644
--- a/src/view/home/FecrAside.vue
+++ b/src/view/home/FecrAside.vue
@@ -2,11 +2,11 @@
-
+
@@ -59,18 +75,28 @@ export default {
id: "4",
title: "设置",
icon: "el-icon-setting",
- content: "userList",
+ children: [
+ {
+ id: "4-1",
+ title: "用户设置",
+ icon: "el-icon-user",
+ content: "userList",
+ },
+ ],
},
],
};
},
- mounted() {
- },
+ mounted() {},
methods: {
handleSelect(key, keyPath) {
this.$store.commit("set_tabs_key", key);
- this.$store.commit("set_tabs", this.menu[Number(key) - 1]);
- this.$emit("handleSelect", keyPath[0]);
+ keyPath.length === 1
+ ? this.$store.commit("set_tabs", this.menu[Number(key) - 1])
+ : this.$store.commit(
+ "set_tabs",
+ this.menu[Number(keyPath[0]) - 1].children[key[key.length - 1] - 1]
+ );
},
},
};
diff --git a/src/view/home/index.vue b/src/view/home/index.vue
index 0667b3a..cd623e1 100644
--- a/src/view/home/index.vue
+++ b/src/view/home/index.vue
@@ -22,6 +22,7 @@
type="card"
closable
@edit="handleTabsEdit"
+ @tab-click="handleClick"
>
{{ item.title }}
-
+
@@ -81,18 +82,22 @@ export default {
this.status = params;
},
+ handleClick(key){
+ this.$store.commit("set_tabs_key", key.name);
+ },
+
handleTabsEdit(targetName, action) {
if (action === "remove") {
const key = this.$store.state.tabs.findIndex((item) => {
return targetName == item.id;
});
- this.$store.commit("set_tabs_key", this.$store.state.tabs[key - 1].id);
this.$store.commit(
"delete_tabs_item",
this.tabs.find((item) => {
return item.id === targetName;
})
);
+ this.$store.commit("set_tabs_key", this.$store.state.tabs[key - 1].id);
}
},
},
diff --git a/src/view/home/main/companyDetails/basic.vue b/src/view/home/main/companyDetails/basic.vue
index fe5442b..02daa5f 100644
--- a/src/view/home/main/companyDetails/basic.vue
+++ b/src/view/home/main/companyDetails/basic.vue
@@ -28,11 +28,14 @@ import { get } from "api/api";
import FecrTable from "components/FecrTable";
export default {
components: { FecrTable },
- props: {
- company_name: [String],
- },
data() {
- return { data: {}, business: [] };
+ return {
+ data: {},
+ business: [],
+ cid: this.$store.state.tabs.find((item) => {
+ return this.$store.state.tabsKey === item.id;
+ }).cid,
+ };
},
created() {
@@ -41,11 +44,8 @@ export default {
methods: {
init() {
- const cid = this.$store.state.tabs.find((item) => {
- return this.$store.state.tabsKey === item.id;
- }).cid;
get("/admin/company/basic_data", {
- cid,
+ cid: this.cid,
}).then((res) => {
this.data = res.result;
this.business = res.result["工商信息"]
@@ -69,6 +69,14 @@ export default {
}
},
},
+ watch:{
+ "$store.state.tabsKey"(newVal) {
+ this.cid = this.$store.state.tabs.find((item) => {
+ return newVal === item.id;
+ }).cid
+ this.init()
+ },
+ }
};