hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-09 02:46:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into manage-release

Browse Source 
# Conflicts:
#	src/App.vue
#	src/api/config.js
#	src/api/method.js
#	src/components/NavTop.vue
#	src/router/index.js
#	src/views/projectcenter/templateAdd.vue
This commit is contained in:
yuping
2022-12-14 23:25:53 +08:00
parent 613a1f285d 12c3a1ce72
commit 04fa60d838
51 changed files with 3156 additions and 3365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/App.vue
View File

@@ -44,15 +44,15 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
console.log("版本0.9.13------------");
console.log("版本0.9.14------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});
watch(
() => route.path,
() => {
route.path === "/login" && (isLogin.value = true);
}
() => route.path,
() => {
route.path === "/login" && (isLogin.value = true);
}
);
const currentRouteName = computed(() => route.name);
@@ -78,8 +78,8 @@ export default defineComponent({
return;
}
const memberInitInfo = await api1
.getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
.then((res) => res.data.data.rows);
.getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
.then((res) => res.data.data.rows);
store.commit("SET_MEMBER_INFO", memberInitInfo);
localStorage.setItem("memberInitInfo", JSON.stringify(memberInitInfo));
}
@@ -104,13 +104,13 @@ export default defineComponent({
}
const getDictList = (param) =>
api1
.getDict({
pageNo: 1,
pageSize: 20,
setCode: param,
})
.then((res) => res.data.data.rows);
api1
.getDict({
pageNo: 1,
pageSize: 20,
setCode: param,
})
.then((res) => res.data.data.rows);
//获取组织树
const getOrgTree = () => {
const orgtreeList = localStorage.getItem("orgtreeList");
@@ -119,16 +119,16 @@ export default defineComponent({
return;
}
api
.getOrgInfo({
keyWord: "",
id: -1,
pageNo: 1,
pageSize: 20,
})
.then((res) => {
localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
store.commit("getOrgtreeList", res.data.data);
});
.getOrgInfo({
keyWord: "",
id: -1,
pageNo: 1,
pageSize: 20,
})
.then((res) => {
localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
store.commit("getOrgtreeList", res.data.data);
});
};
init();
return {
@@ -167,7 +167,7 @@ export default defineComponent({
// font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
// sans-serif;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
Microsoft YaHei, Arial, sans-serif;
Microsoft YaHei, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;