Commit ca51386b authored by sheng du's avatar sheng du
Browse files

开发基本完成

parent 360dbb0b
{
"name": "templat",
"name": "countingdreams",
"version": "0.1.0",
"private": true,
"scripts": {
......
src/assets/img/enterpriseAvater.png

17.7 KB

src/assets/img/login-left-top.png

22.3 KB

src/assets/img/login-logo-back.png

66.8 KB

src/assets/img/login-logo.png

9.37 KB

src/assets/img/login-right-bottom.png

9.92 KB

src/assets/img/nav/materials.png

433 Bytes

src/assets/img/nav/materialsActive.png

467 Bytes

src/assets/img/test-business.png

125 KB

src/assets/img/test-honor.png

13.1 KB

......@@ -5,18 +5,18 @@
<span class="welcome">欢迎来到数字空间!</span>
<img src="@/assets/img/user.png" alt="" />
<span class="user-name">刘云</span>
<span class="user-name">{{ userInfo?.name }}</span>
<img src="@/assets/img/login-out.png" @click="loginOut" alt="" />
</div>
</div>
</template>
<script>
import dayjs from "dayjs";
import { mapState } from "vuex";
// import { appName } from "@/config";
// import { asyncRoutesSort } from "@/router";
// import cloneDeep from "lodash/cloneDeep";
// console.log(asyncRoutes);
export default {
name: "AppHeader",
data() {
......@@ -32,6 +32,9 @@ export default {
};
},
computed: {
...mapState({
userInfo: (state) => state.user.userInfo,
}),
// menus() {
// return cloneDeep(asyncRoutesSort);
// },
......
......@@ -82,7 +82,9 @@ export default {
this.$store.dispatch("app/removeCacheRoutes", findItem.parent.name);
}
//从列表去掉
this.pathList = this.pathList.filter((item) => item?.path != targetName);
this.pathList = this.pathList.filter(
(item) => item?.path != targetName
);
if (this.$route.path == targetName) {
//关闭当前页面跳转到最后一个页面
this.$router.replace(this.pathList[this.pathList.length - 1]?.path);
......
......@@ -86,7 +86,7 @@ export default {
// this.imgList = [...this.value, base64];
// };
// reader.onerror = (error) => {
// console.log(error);
// // console.log(error);
// };
},
deleteImg(item, index) {
......
......@@ -35,7 +35,7 @@ export default {
type: String,
default: () => "标题",
},
width:{
width: {
type: String,
default: () => "720px",
},
......@@ -52,7 +52,7 @@ export default {
},
methods: {
beforeClose() {
// console.log('beforeClose');
// console.log("beforeClose");
// this.dialogVisible = false;
this.$emit("beforeClose");
},
......
......@@ -24,7 +24,7 @@ export default {
}),
menus() {
let allMenu = this.treeMap(cloneDeep(asyncRoutesSort));
console.log(allMenu);
// console.log(allMenu);
// let findFatherItem = allMenu;
return allMenu || [];
......@@ -68,7 +68,9 @@ export default {
});
// console.log(res);
res = res.filter(
//这里可控制菜单是否 关联权限
(item) => !item.meta.hidden && this.userAuth.includes(item.name)
// (item) => !item.meta.hidden
);
return res?.length ? res : null;
},
......
......@@ -2,11 +2,20 @@
<div class="sub-header">
<div class="user-info flex">
<div class="avatar">
<img src="@/assets/img/avatar-test.png" alt="" />
<img
v-if="userInfo?.type == 1"
src="@/assets/img/avatar-test.png"
alt=""
/>
<img
v-if="userInfo?.type == 2"
src="@/assets/img/enterpriseAvater.png"
alt=""
/>
</div>
<div class="info">
<div>您好,欢迎登录~</div>
<div class="name">李云</div>
<div class="name">{{ userInfo?.name }}</div>
<div class="level">
<span>认证等级:</span>
<div class="level-box">四级认证</div>
......@@ -17,12 +26,17 @@
</template>
<script>
import { mapState } from "vuex";
export default {
name: "SubHeader",
data() {
return {};
},
computed: {},
computed: {
...mapState({
userInfo: (state) => state.user.userInfo,
}),
},
watch: {},
methods: {},
};
......
......@@ -281,7 +281,7 @@ export default {
},
methods: {
reset() {
console.log(this.data);
// console.log(this.data);
for (let p in this.data) {
// if (Array.isArray(this.data[p])) {
// // const index = parseInt(p.substring(6));
......@@ -390,7 +390,7 @@ export default {
let selectVal = this.select.val;
// console.log(this.ranges);
// setTimeout(() => {
// console.log(this.ranges);
// // console.log(this.ranges);
// }, 2000);
this.ranges.keys.forEach((key, index) => {
paramsRanges[key] = this.ranges.val ? this.ranges.val[index] : "";
......
......@@ -361,7 +361,7 @@ export default {
}
// console.log(data);
}
//console.log(params);
// console.log(params);
let res = await this.fetcher(params);
setTimeout(() => {
if (!res) {
......@@ -375,6 +375,7 @@ export default {
this.scrollTop();
}, 300);
} catch (e) {
console.error(e);
// console.log(e);
this.loading = false;
}
......@@ -385,7 +386,7 @@ export default {
this.mergeColumns();
this.calcHeight();
this.scrollTop();
// console.log('手动修改data',data);
// console.log("手动修改data", data);
},
sortChange({ column, prop, order }) {
......
......@@ -49,7 +49,7 @@ const genRouter = function(requireContext) {
};
const mapSort = function(menus) {
console.log(menus);
// console.log(menus);
//递归,对路由进行排序,添加name和icon
const _menus = menus
.sort((a, b) => {
......@@ -76,7 +76,7 @@ const routes = [
},
{
path: "/login",
name:'login',
name: "login",
component: () =>
import(/* webpackChunkName: "accout" */ "@/views/login.vue"),
// redirect: "/index"
......@@ -99,7 +99,7 @@ const router = new VueRouter({
router.beforeEach((to, from, next) => {
let userAuth = store.state.user.userAuth;
console.log(to, userAuth);
// console.log(to, userAuth);
if (to.meta.keepAlive) {
store.dispatch("app/addCacheRoutes", to.name);
}
......@@ -110,11 +110,12 @@ router.beforeEach((to, from, next) => {
next();
} else {
router.replace("/login");
next();
}
});
router.addRoutes(asyncRoutes);
console.log(router);
// console.log(router);
export default router;
export { asyncRoutes, asyncRoutesSort };
......
import testCardPhoto from "@/assets/img/test-card-photo.png";
import testBusiness from "@/assets/img/test-business.png";
export default {
namespaced: true,
state: {
......@@ -12,12 +13,21 @@ export default {
time: "2023-01-13",
},
],
enterprisePhoto: [
{
id: 1,
name: "营业执照",
pic: testBusiness,
picList: [testBusiness],
time: "2023-01-13",
},
],
},
actions: {
//修改列表数据
changeTableData({ commit }, paylod) {
const { field, data } = paylod;
console.log(field, data);
// console.log(field, data);
commit("SET_TABLE_DATA", { field, data });
},
},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment