From 9c7d3db786759480888cef3c371ec17a22443f26 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Wed, 22 Jun 2022 18:10:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B5=8B=E8=83=BD=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/assignCase/components/AssignCaseDetailPage.vue | 9 ++++++--- front/src/views/assignCase/components/queryPage.vue | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/front/src/views/assignCase/components/AssignCaseDetailPage.vue b/front/src/views/assignCase/components/AssignCaseDetailPage.vue index 577a47d1..795b597c 100644 --- a/front/src/views/assignCase/components/AssignCaseDetailPage.vue +++ b/front/src/views/assignCase/components/AssignCaseDetailPage.vue @@ -41,9 +41,12 @@ :key="index" @click="tabSwitch(item, index)" :class=" - tabName == item.attrType + (tabName == item.attrType ? 'assign-case-detail-page-content-left-border-click' - : '' + : '') || + (selectNow == item.id + ? 'assign-case-detail-page-content-left-border-click' + : '') " > {{ item.attrType }} @@ -175,7 +178,7 @@ ) //tab点击事件 const tabSwitch = (item, index) => { - tabName.value = item.title + tabName.value = item.attrType if (index != 0 && index != 3) { let top = document.querySelector( diff --git a/front/src/views/assignCase/components/queryPage.vue b/front/src/views/assignCase/components/queryPage.vue index dab439ec..8345faeb 100644 --- a/front/src/views/assignCase/components/queryPage.vue +++ b/front/src/views/assignCase/components/queryPage.vue @@ -168,6 +168,7 @@ tabClickShow.value = true } else { let list = [] + listBg.value = '' init(list) tabClickShow.value = false } From 4815a3fe3d7151fc644c31a8f45a37652e0d4702 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Thu, 23 Jun 2022 18:19:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/public/index.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/back/public/index.html b/back/public/index.html index b48dcb0f..3fa6707f 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -1,8 +1,8 @@ @@ -27,9 +27,9 @@ 'isTab': true, // 是否通过tab展示内容? 'iframeURL': '' // 是否通过iframe嵌套展示内容? (以http[s]://开头, 自动匹配) }; - // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/#/vueTemplateDemo'; + window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/#/vueTemplateDemo'; // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/#/vueTemplateDemo'; - window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo'; + // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo'; // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9797/#/vueTemplateDemo'; window.SITE_CONFIG['menuList'] = []; // 左侧菜单列表（后台返回，未做处理） window.SITE_CONFIG['permissions'] = []; // 页面按钮操作权限（后台返回，未做处理） @@ -42,7 +42,8 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> + + diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index b4280a91..bc20876b 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -6,9 +6,11 @@ -->
+
+ +
-
基础信息
@@ -33,7 +35,7 @@
- - - -
更多申请信息
- diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply.vue b/back/src/views/modules/activiti/demo/abilitydemandapply.vue index 94acd632..e17e29db 100644 --- a/back/src/views/modules/activiti/demo/abilitydemandapply.vue +++ b/back/src/views/modules/activiti/demo/abilitydemandapply.vue @@ -1,106 +1,134 @@ + diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply_before.vue b/back/src/views/modules/activiti/demo/abilitydemandapply_before.vue new file mode 100644 index 00000000..17fec47b --- /dev/null +++ b/back/src/views/modules/activiti/demo/abilitydemandapply_before.vue @@ -0,0 +1,175 @@ + + + +