diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply.vue b/back/src/views/modules/activiti/demo/abilitydemandapply.vue index e5037ae2..11f2f09e 100644 --- a/back/src/views/modules/activiti/demo/abilitydemandapply.vue +++ b/back/src/views/modules/activiti/demo/abilitydemandapply.vue @@ -248,7 +248,6 @@ export default { this.dataForm.taskId = this.$route.params.taskId if (type === '同意') { - debugger // if (this.input !== '') { console.log('this.dataForm', this.dataForm) const params = qs.stringify({ @@ -267,6 +266,7 @@ export default { return } bus.$emit('applicationforRequirementsInit') + bus.$emit('workInit') this.$message({ message: this.$t('prompt.success'), type: 'success', @@ -302,6 +302,7 @@ export default { return } bus.$emit('applicationforRequirementsInit') + bus.$emit('workInit') this.$message({ message: this.$t('prompt.success'), type: 'success', diff --git a/back/src/views/modules/activiti/demo/comments.vue b/back/src/views/modules/activiti/demo/comments.vue index 6c539f0e..f2171a60 100644 --- a/back/src/views/modules/activiti/demo/comments.vue +++ b/back/src/views/modules/activiti/demo/comments.vue @@ -174,7 +174,8 @@ export default { } return } - bus.$emit('AbilityResourcesRemovedInit') + bus.$emit('commentInit') + bus.$emit('workInit') this.$message({ message: this.$t('prompt.success'), type: 'success', @@ -209,7 +210,8 @@ export default { } return } - bus.$emit('AbilityResourcesRemovedInit') + bus.$emit('commentInit') + bus.$emit('workInit') this.$message({ message: this.$t('prompt.success'), type: 'success', @@ -259,20 +261,7 @@ export default { } }, created () { - // this.dataForm = this.$router.currentRoute.params.id this.init() - console.log('fromList', this.$router.currentRoute.params.businessKey) - // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO - var callbacks = { - startProcessSuccessCallback: this.closeCurrentTab, - startProcessErrorCallback: this.startProcessErrorCallback, - taskHandleSuccessCallback: this.closeCurrentTab, - taskHandleErrorCallback: this.taskHandleErrorCallback, - formSaveSuccessCallback: null, - formSaveErrorCallback: null - } - // 初始化综合组件 - this.initProcessMultiple(callbacks) this.taskId = this.$route.params.taskId this.dataForm.taskId = this.$route.params.taskId }, diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue index 97829af5..91e353c4 100644 --- a/back/src/views/modules/activiti/demo/putaway-process3.vue +++ b/back/src/views/modules/activiti/demo/putaway-process3.vue @@ -252,6 +252,7 @@ export default { return } bus.$emit('AbilityResourcesRemovedInit') + bus.$emit('workInit') this.$message({ message: this.$t('prompt.success'), type: 'success', @@ -287,6 +288,7 @@ export default { return } bus.$emit('AbilityResourcesRemovedInit') + bus.$emit('workInit') this.$message({ message: this.$t('prompt.success'), type: 'success', diff --git a/back/src/views/modules/myAgent/CommentModeration.vue b/back/src/views/modules/myAgent/CommentModeration.vue index 1fefa8ea..6d8e620e 100644 --- a/back/src/views/modules/myAgent/CommentModeration.vue +++ b/back/src/views/modules/myAgent/CommentModeration.vue @@ -128,6 +128,7 @@ + diff --git a/back/src/views/modules/notice/index.html b/back/src/views/modules/notice/index.html new file mode 100644 index 00000000..b87bbe95 --- /dev/null +++ b/back/src/views/modules/notice/index.html @@ -0,0 +1,32 @@ + + + + + + 滚动文字 + + + +嗨 +你好 +山月剧 +明哥 + + \ No newline at end of file diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue index 5830b6eb..6c11bf07 100644 --- a/back/src/views/modules/workBench/workBench.vue +++ b/back/src/views/modules/workBench/workBench.vue @@ -35,7 +35,7 @@ import CenterView from '../workBench/components/center-view.vue' import DeptChartView from '../workBench/components/dept-chart-view.vue' import deptTodoView from '../workBench/components/dept-todo-view.vue' import * as Apis from './api.js' - +import bus from '@/views/bus.js' export default { components: { deptTodoView, @@ -87,6 +87,14 @@ export default { loadingRequire: false } }, + created () { + bus.$off('workInit') + bus.$on('workInit', () => { + console.log("刷新工作台===================") + this.getToDo() + this.getHasToDo() + }) + }, mounted () { // 部门待办 this.getToDo() diff --git a/front/src/App.vue b/front/src/App.vue index 8644867e..7a12d9d6 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-05-06 11:12:00 * @LastEditors: Light - * @LastEditTime: 2022-11-29 17:28:20 + * @LastEditTime: 2022-12-01 15:46:55 * @Description: 告诉大家这是什么 --> @@ -194,6 +198,7 @@ onMounted(() => { }) diff --git a/front/src/views/home/components/ApplicationTopDetails.vue b/front/src/views/home/components/ApplicationTopDetails.vue index d25d5f09..26495f16 100644 --- a/front/src/views/home/components/ApplicationTopDetails.vue +++ b/front/src/views/home/components/ApplicationTopDetails.vue @@ -9,13 +9,13 @@
- + {{ props.dataList.name }} - + {{ props.dataList.name }}

@@ -27,29 +27,55 @@ {{ props.dataList.shareCondition }} -

-
-
- + +
+ 场景描述： {{ props.dataList.description || '--' }} +
+
+ 场景描述： {{ props.dataList.description.slice(0, 183) }}... + + {{ dowmOrUp }} + +
+
+ 场景描述： {{ props.dataList.description }} + + {{ dowmOrUp }} + +
+
+ 场景入口: + + {{ props.dataList.sceneUrl }} + +
@@ -80,287 +106,299 @@ -->
-
- -
+
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue index 90092666..02a63db3 100644 --- a/front/src/views/home/components/header.vue +++ b/front/src/views/home/components/header.vue @@ -420,7 +420,7 @@ }) mybus.on('changeMenuStyle', (data) => { - debugger + targetRouter.value = data if (data.path == '/algorithmCompare') { jumpPage( diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue index 7952c312..f0d84e89 100644 --- a/front/src/views/home/integrationServices.vue +++ b/front/src/views/home/integrationServices.vue @@ -31,9 +31,11 @@ /> +
+
检测结果: {{resourceTotal}}个
+