diff --git a/.gitignore b/.gitignore index d74d9b8..ffab75d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules /dist +dist.zip /tests/e2e/videos/ /tests/e2e/screenshots/ diff --git a/dist.zip b/dist.zip deleted file mode 100644 index b86d7b3..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 8ca868e..ad4e661 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -63,10 +63,11 @@ export default { // 刷新token的时间 refreshTime: '', // 计时器 - timer: '' + timer: '', } }, created() { + this.loading = true // 实时检测刷新token this.refreshToken() }, diff --git a/src/page/index/top/top-menu.vue b/src/page/index/top/top-menu.vue index 13ad9e3..2c564f8 100644 --- a/src/page/index/top/top-menu.vue +++ b/src/page/index/top/top-menu.vue @@ -35,6 +35,7 @@ export default { this.getTopMenu() // 用户权限加载 this.getUserInfo() + console.log('this.getUserInfo()') }, computed: { ...mapGetters(['menu']) diff --git a/src/page/wel.vue b/src/page/wel.vue index 0486694..a9cbf27 100644 --- a/src/page/wel.vue +++ b/src/page/wel.vue @@ -434,7 +434,8 @@ -
+ +
待处理 @@ -1069,12 +1070,7 @@
-
- 欢迎光临 -
+ @@ -1128,14 +1124,12 @@ export default { info() { return this.$store.state.user.userInfo } - }, mounted() { this.role = localStorage.getItem("orgType"); if (this.role == 3) { this.houseId = localStorage.getItem("houseId"); - this.getgicd(); // 获取维度占比 this.getindexZxllist(); @@ -1150,6 +1144,7 @@ export default { this.waitingForOperation(); } }, + methods: { // 跳转详情 toDetail(path, params2 = "", name) { diff --git a/src/views/Receive/index.vue b/src/views/Receive/index.vue index 82a15cd..c154d94 100644 --- a/src/views/Receive/index.vue +++ b/src/views/Receive/index.vue @@ -1796,8 +1796,8 @@ export default { .findText({ corpusId: this.arr[this.aplayerId].id }) .then((res) => { console.log(res, "获取文本"); - this.optimizeobj = res.data; - this.optimizetext = JSON.parse(res.data.textContent); + this.optimizeobj = res.data; + this.optimizetext = JSON.parse(res.data.textContent); this.dialogFormtext = true; }); }, diff --git a/src/views/ReceivingRecords/index.vue b/src/views/ReceivingRecords/index.vue index 8d32b7f..ac20d51 100644 --- a/src/views/ReceivingRecords/index.vue +++ b/src/views/ReceivingRecords/index.vue @@ -336,6 +336,7 @@ {{ row.zfal == 0 ? "已加精" : "未加精" }} +