diff --git a/back/public/index.html b/back/public/index.html index b48dcb0f..eb19bbb6 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/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 @@ + + + + diff --git a/front/src/assets/home/remove-hover.png b/front/src/assets/home/remove-hover.png new file mode 100644 index 00000000..9152216b Binary files /dev/null and b/front/src/assets/home/remove-hover.png differ diff --git a/front/src/assets/home/remove.png b/front/src/assets/home/remove.png new file mode 100644 index 00000000..87b146ba Binary files /dev/null and b/front/src/assets/home/remove.png differ 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 } diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue index 44ebfcd0..6edef0b1 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue @@ -128,6 +128,7 @@ width: 7.2rem; color: #fff; margin-right: 0.8rem; + margin-top: -0.3rem; .top { display: flex; align-items: center; @@ -135,10 +136,11 @@ font-size: 14px; } .name { - // max-width: 330px; + display: inline-block; + width: 10.2rem; // overflow: hidden; // text-overflow: ellipsis; - white-space: nowrap; + // white-space: nowrap; font-size: 40px; margin-right: 20px; } diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue new file mode 100644 index 00000000..8f2e607b --- /dev/null +++ b/front/src/views/home/AbilityToApplyFor.vue @@ -0,0 +1,125 @@ + + + + + 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 @@
- - - -
更多申请信息
-